Fixed some __BEOS__ vs __HAIKU__ preprocessor tests (thanks, Axel!).
authorRyan C. Gordon <icculus@icculus.org>
Fri, 05 Jul 2013 01:09:27 -0400
changeset 7346ff228f955a48
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
     1.1 --- a/src/SDL.c	Fri Jul 05 00:54:00 2013 -0400
     1.2 +++ b/src/SDL.c	Fri Jul 05 01:09:27 2013 -0400
     1.3 @@ -371,9 +371,6 @@
     1.4      return "AIX";
     1.5  #elif __ANDROID__
     1.6      return "Android";
     1.7 -#elif __HAIKU__
     1.8 -/* Haiku must appear here before BeOS, since it also defines __BEOS__ */
     1.9 -    return "Haiku";
    1.10  #elif __BEOS__
    1.11      return "BeOS";
    1.12  #elif __BSDI__
    1.13 @@ -382,6 +379,8 @@
    1.14      return "Dreamcast";
    1.15  #elif __FREEBSD__
    1.16      return "FreeBSD";
    1.17 +#elif __HAIKU__
    1.18 +    return "Haiku";
    1.19  #elif __HPUX__
    1.20      return "HP-UX";
    1.21  #elif __IRIX__
     2.1 --- a/src/events/SDL_sysevents.h	Fri Jul 05 00:54:00 2013 -0400
     2.2 +++ b/src/events/SDL_sysevents.h	Fri Jul 05 01:09:27 2013 -0400
     2.3 @@ -24,7 +24,8 @@
     2.4  
     2.5  /* Useful functions and variables from SDL_sysevents.c */
     2.6  
     2.7 -#ifdef __BEOS__                 /* The Be event loop runs in a separate thread */
     2.8 +#if defined(__BEOS__) || defined(__HAIKU__) 
     2.9 +/* The Be and Haiku event loops run in a separate thread */
    2.10  #define MUST_THREAD_EVENTS
    2.11  #endif
    2.12