sync with trunk

libsdl-org · Jul 2, 2008 · 0f42551 · 0f42551
1 parent d35dac3
commit 0f42551
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/include/SDL_main.h b/include/SDL_main.h
@@ -29,7 +29,7 @@
 
 #if defined(__WIN32__) || \
     (defined(__MWERKS__) && !defined(__BEOS__)) || \
-    defined(__SYMBIAN32__)
+    defined(__SYMBIAN32__) || defined(__IPHONEOS__)
 
 #ifdef __cplusplus
 #define C_LINKAGE	"C"

diff --git a/include/SDL_platform.h b/include/SDL_platform.h
@@ -57,13 +57,19 @@
 #undef __LINUX__
 #define __LINUX__	1
 #endif
+
 #if defined(__APPLE__)
+#include "targetconditionals.h"
+#if TARGET_OS_IPHONE
+#undef __IPHONEOS__
+#define __IPHONEOS__ 1
+#undef __MACOSX__
+#else
 #undef __MACOSX__
 #define __MACOSX__	1
-#elif defined(macintosh)
-#undef __MACOS__
-#define __MACOS__	1
 #endif
+#endif
+
 #if defined(__NetBSD__)
 #undef __NETBSD__
 #define __NETBSD__	1

diff --git a/include/SDL_stdinc.h b/include/SDL_stdinc.h
@@ -147,8 +147,8 @@ SDL_COMPILE_TIME_ASSERT(uint16, sizeof(Uint16) == 2);
 SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2);
 SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4);
 SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4);
-SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8);
-SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8);
+//SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8);
+//SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8);
 #endif /* DOXYGEN_SHOULD_IGNORE_THIS */
 
 /* Check to make sure enums are the size of ints, for structure packing.