Reverted Holmes' changes, they should be on the iphone branch

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402811

include/SDL_main.h

@@ -29,7 +29,7 @@
 
 #if defined(__WIN32__) || \
     (defined(__MWERKS__) && !defined(__BEOS__)) || \
-    defined(__SYMBIAN32__) || defined(__IPHONEOS__)
+    defined(__SYMBIAN32__)
 
 #ifdef __cplusplus
 #define C_LINKAGE	"C"

include/SDL_platform.h

@@ -57,19 +57,13 @@
 #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

include/SDL_stdinc.h

@@ -147,10 +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.
@@ -391,7 +389,6 @@ do {							\
 	}						\
 } while(0)
 #endif
-	
 #ifndef SDL_revcpy
 extern DECLSPEC void *SDLCALL SDL_revcpy(void *dst, const void *src,
                                          size_t len);