Mercurial > sdl-ios-xcode
changeset 2707:6259afb046c5
Reverted Holmes' changes, they should be on the iphone branch
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sat, 05 Jul 2008 16:15:44 +0000 |
| parents | ce3ddf8dd6d2 |
| children | c9d71d0f987d |
| files | include/SDL_main.h include/SDL_platform.h include/SDL_stdinc.h |
| diffstat | 3 files changed, 6 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/include/SDL_main.h Sun Jun 22 23:13:02 2008 +0000 +++ b/include/SDL_main.h Sat Jul 05 16:15:44 2008 +0000 @@ -29,7 +29,7 @@ #if defined(__WIN32__) || \ (defined(__MWERKS__) && !defined(__BEOS__)) || \ - defined(__SYMBIAN32__) || defined(__IPHONEOS__) + defined(__SYMBIAN32__) #ifdef __cplusplus #define C_LINKAGE "C"
--- a/include/SDL_platform.h Sun Jun 22 23:13:02 2008 +0000 +++ b/include/SDL_platform.h Sat Jul 05 16:15:44 2008 +0000 @@ -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 -#endif +#elif defined(macintosh) +#undef __MACOS__ +#define __MACOS__ 1 #endif - #if defined(__NetBSD__) #undef __NETBSD__ #define __NETBSD__ 1
--- a/include/SDL_stdinc.h Sun Jun 22 23:13:02 2008 +0000 +++ b/include/SDL_stdinc.h Sat Jul 05 16:15:44 2008 +0000 @@ -147,10 +147,8 @@ 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 @@ } \ } while(0) #endif - #ifndef SDL_revcpy extern DECLSPEC void *SDLCALL SDL_revcpy(void *dst, const void *src, size_t len);