pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed some __BEOS__ vs __HAIKU__ preprocessor tests (thanks, Axel!).

Browse source 
Fixes Bugzilla #1773.
This commit is contained in:
Ryan C. Gordon 2013-07-05 01:09:27 -04:00
parent 522eeaf814
commit 32e16f45fa
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/SDL.c
View file

@ -371,9 +371,6 @@ SDL_GetPlatform()
return "AIX"; return "AIX";
#elif __ANDROID__ #elif __ANDROID__
return "Android"; return "Android";
#elif __HAIKU__
/* Haiku must appear here before BeOS, since it also defines __BEOS__ */
return "Haiku";
#elif __BEOS__ #elif __BEOS__
return "BeOS"; return "BeOS";
#elif __BSDI__ #elif __BSDI__
@ -382,6 +379,8 @@ SDL_GetPlatform()
return "Dreamcast"; return "Dreamcast";
#elif __FREEBSD__ #elif __FREEBSD__
return "FreeBSD"; return "FreeBSD";
#elif __HAIKU__
return "Haiku";
#elif __HPUX__ #elif __HPUX__
return "HP-UX"; return "HP-UX";
#elif __IRIX__ #elif __IRIX__

3
src/events/SDL_sysevents.h
View file

@ -24,7 +24,8 @@
/* Useful functions and variables from SDL_sysevents.c */ /* 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 #define MUST_THREAD_EVENTS
#endif #endif