Fixed some __BEOS__ vs __HAIKU__ preprocessor tests (thanks, Axel!).
authorRyan C. Gordon <icculus@icculus.org>
Fri, 05 Jul 2013 01:09:27 -0400
changeset 7346 ff228f955a48
parent 7345 0021ad840cdd
child 7347 b4f6a86e8523
Fixed some __BEOS__ vs __HAIKU__ preprocessor tests (thanks, Axel!). Fixes Bugzilla #1773.
src/SDL.c
src/events/SDL_sysevents.h
--- a/src/SDL.c	Fri Jul 05 00:54:00 2013 -0400
+++ b/src/SDL.c	Fri Jul 05 01:09:27 2013 -0400
@@ -371,9 +371,6 @@
     return "AIX";
 #elif __ANDROID__
     return "Android";
-#elif __HAIKU__
-/* Haiku must appear here before BeOS, since it also defines __BEOS__ */
-    return "Haiku";
 #elif __BEOS__
     return "BeOS";
 #elif __BSDI__
@@ -382,6 +379,8 @@
     return "Dreamcast";
 #elif __FREEBSD__
     return "FreeBSD";
+#elif __HAIKU__
+    return "Haiku";
 #elif __HPUX__
     return "HP-UX";
 #elif __IRIX__
--- a/src/events/SDL_sysevents.h	Fri Jul 05 00:54:00 2013 -0400
+++ b/src/events/SDL_sysevents.h	Fri Jul 05 01:09:27 2013 -0400
@@ -24,7 +24,8 @@
 
 /* Useful functions and variables from SDL_sysevents.c */
 
-#ifdef __BEOS__                 /* The Be event loop runs in a separate thread */
+#if defined(__BEOS__) || defined(__HAIKU__) 
+/* The Be and Haiku event loops run in a separate thread */
 #define MUST_THREAD_EVENTS
 #endif