From 4e187ad6425e7a76feb3ecdcf81314ba715bfb83 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 20 Apr 2015 21:12:39 +0200 Subject: [PATCH] Refactor around HAVE_MAIN and do away with HAVE_MAIN_LOOP --- frontend/frontend.c | 8 ++------ frontend/frontend.h | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/frontend/frontend.c b/frontend/frontend.c index b73c06b2a3..2c9b85a85c 100644 --- a/frontend/frontend.c +++ b/frontend/frontend.c @@ -32,10 +32,6 @@ #define args_initial_ptr() NULL #endif -#if !defined(__APPLE__) && !defined(EMSCRIPTEN) -#define HAVE_MAIN_LOOP -#endif - #define MAX_ARGS 32 /** @@ -274,7 +270,7 @@ error: * * Main function of RetroArch. * - * If HAVE_MAIN_LOOP is defined, will contain main loop and will not + * If HAVE_MAIN is not defined, will contain main loop and will not * be exited from until we exit the program. Otherwise, will * just do initialization. * @@ -344,7 +340,7 @@ int rarch_main(int argc, char *argv[]) driver->ui_companion->toggle(driver->ui_companion_data); } -#if defined(HAVE_MAIN_LOOP) +#ifndef HAVE_MAIN while (rarch_main_iterate() != -1); main_exit(args); diff --git a/frontend/frontend.h b/frontend/frontend.h index bd8d20c63f..892434a4ce 100644 --- a/frontend/frontend.h +++ b/frontend/frontend.h @@ -53,7 +53,7 @@ void main_exit_save_config(void); * * Main function of RetroArch. * - * If HAVE_MAIN_LOOP is defined, will contain main loop and will not + * If HAVE_MAIN is not defined, will contain main loop and will not * be exited from until we exit the program. Otherwise, will * just do initialization. *