Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

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

Fixes Bugzilla #1773.
  • Loading branch information
icculus committed Jul 5, 2013
1 parent 26302f4 commit 651d1e40c14875c90b6a5a37ff38d2b7b8cb5d85
Showing with 4 additions and 4 deletions.
  1. +2 −3 src/SDL.c
  2. +2 −1 src/events/SDL_sysevents.h
@@ -371,9 +371,6 @@ SDL_GetPlatform()
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 @@ SDL_GetPlatform()
return "Dreamcast";
#elif __FREEBSD__
return "FreeBSD";
#elif __HAIKU__
return "Haiku";
#elif __HPUX__
return "HP-UX";
#elif __IRIX__
@@ -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

0 comments on commit 651d1e4

Please sign in to comment.