# HG changeset patch # User Sam Lantinga # Date 1147244921 0 # Node ID 54f63955dc1f7dc6aab09c9dd9f19db0fc00b8df # Parent e308d020d3150587b34fc8754fadb834c74806ae Prevent both __MACOS__ and __MACOSX__ from being defined in Codewarrior diff -r e308d020d315 -r 54f63955dc1f include/SDL_platform.h --- a/include/SDL_platform.h Wed May 10 06:12:45 2006 +0000 +++ b/include/SDL_platform.h Wed May 10 07:08:41 2006 +0000 @@ -61,13 +61,12 @@ #undef __LINUX__ #define __LINUX__ 1 #endif -#if defined(macintosh) -#undef __MACOS__ -#define __MACOS__ 1 -#endif #if defined(__APPLE__) #undef __MACOSX__ #define __MACOSX__ 1 +#elif defined(macintosh) +#undef __MACOS__ +#define __MACOS__ 1 #endif #if defined(__NetBSD__) #undef __NETBSD__