diff options
| author | Ryan C. Gordon <icculus@icculus.org> | 2013-07-05 01:09:27 -0400 |
|---|---|---|
| committer | Ryan C. Gordon <icculus@icculus.org> | 2013-07-05 01:09:27 -0400 |
| commit | e749bdffe75fffb27fdd6279a8eaabdf8fa7338a (patch) | |
| tree | 893c3ba7f842ffb0d8c27dada8d12dbbdc244418 | |
| parent | 6ca14bb9d248a0a76734c9c9ff0c50a27f5113fe (diff) | |
Fixed some __BEOS__ vs __HAIKU__ preprocessor tests (thanks, Axel!).
Fixes Bugzilla #1773.
| -rw-r--r-- | src/SDL.c | 5 | ||||
| -rw-r--r-- | src/events/SDL_sysevents.h | 3 |
2 files changed, 4 insertions, 4 deletions
@@ -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__ diff --git a/src/events/SDL_sysevents.h b/src/events/SDL_sysevents.h index 88df0ea096..c2f1e097bd 100644 --- a/src/events/SDL_sysevents.h +++ b/src/events/SDL_sysevents.h @@ -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 |