Mercurial > sdl-ios-xcode

diff include/SDL_platform.h @ 1659:14717b52abc0 SDL-1.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge trunk-1.3-3
author Sam Lantinga <slouken@libsdl.org>
date Wed, 17 May 2006 08:18:28 +0000
parents 510b009a864c
children c9aa6bcb26f3
line wrap: on
line diff
--- a/include/SDL_platform.h	Mon May 01 06:58:33 2006 +0000
+++ b/include/SDL_platform.h	Wed May 17 08:18:28 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__