From 83b6aeb6cc47a24068102a8bc8acb8862adacb9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
Date: Mon, 15 Sep 2014 13:14:05 -0300
Subject: [PATCH] Fix C++ build linkage

---
 frontend/frontend.c         | 9 ---------
 frontend/frontend_context.h | 6 ++++++
 tools/retrolaunch/main.c    | 3 +++
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frontend/frontend.c b/frontend/frontend.c
index 378f13b011..32b8a25c41 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -18,8 +18,6 @@
 #include "frontend.h"
 #include "../general.h"
 
-#include "frontend_context.h"
-
 #if defined(HAVE_MENU)
 #include "menu/menu_input_line_cb.h"
 #include "menu/menu_common.h"
@@ -31,7 +29,6 @@
 
 #if defined(ANDROID)
 
-#define main_entry android_app_entry
 #define returntype void
 #define returnfunc() exit(0)
 #define return_negative() return
@@ -41,12 +38,6 @@
 #define args_initial_ptr() data
 #else
 
-#if defined(__APPLE__) || defined(HAVE_BB10) || defined(EMSCRIPTEN)
-#define main_entry rarch_main
-#else
-#define main_entry main
-#endif
-
 #define returntype int
 #define returnfunc() return 0
 #define return_negative() return 1
diff --git a/frontend/frontend_context.h b/frontend/frontend_context.h
index e51466dad9..9bde1ef795 100644
--- a/frontend/frontend_context.h
+++ b/frontend/frontend_context.h
@@ -26,11 +26,17 @@
 
 #if defined(ANDROID)
 #include "platform/platform_android.h"
+#define main_entry android_app_entry
 #define args_type() struct android_app*
 #define signature() void* data
 #define signature_expand() data
 #define returntype void
 #else
+#if defined(__APPLE__) || defined(HAVE_BB10) || defined(EMSCRIPTEN)
+#define main_entry rarch_main
+#else
+#define main_entry main
+#endif
 #define args_type() void*
 #define signature() int argc, char *argv[]
 #define signature_expand() argc, argv
diff --git a/tools/retrolaunch/main.c b/tools/retrolaunch/main.c
index 8de0da09b7..c70270a4e7 100644
--- a/tools/retrolaunch/main.c
+++ b/tools/retrolaunch/main.c
@@ -281,6 +281,9 @@ int detect_file(const char *path, char *game_name, size_t max_len,
 }
 
 #ifndef RARCH_CONSOLE
+#ifndef __APPLE__
+#undef main
+#endif
 int main(int argc, char *argv[])
 {
    struct RunInfo info;