sync with trunk gsoc2008_manymouse
authorSzymon Wilczek <kazeuser@gmail.com>
Wed, 02 Jul 2008 20:20:51 +0000
branchgsoc2008_manymouse
changeset 3762f667489e7309
parent 3761 e0c95ad1ba87
child 3763 81ea7d9a6624
sync with trunk
include/SDL_main.h
include/SDL_platform.h
include/SDL_stdinc.h
     1.1 --- a/include/SDL_main.h	Thu Jun 19 17:24:30 2008 +0000
     1.2 +++ b/include/SDL_main.h	Wed Jul 02 20:20:51 2008 +0000
     1.3 @@ -29,7 +29,7 @@
     1.4  
     1.5  #if defined(__WIN32__) || \
     1.6      (defined(__MWERKS__) && !defined(__BEOS__)) || \
     1.7 -    defined(__SYMBIAN32__)
     1.8 +    defined(__SYMBIAN32__) || defined(__IPHONEOS__)
     1.9  
    1.10  #ifdef __cplusplus
    1.11  #define C_LINKAGE	"C"
     2.1 --- a/include/SDL_platform.h	Thu Jun 19 17:24:30 2008 +0000
     2.2 +++ b/include/SDL_platform.h	Wed Jul 02 20:20:51 2008 +0000
     2.3 @@ -57,13 +57,19 @@
     2.4  #undef __LINUX__
     2.5  #define __LINUX__	1
     2.6  #endif
     2.7 +
     2.8  #if defined(__APPLE__)
     2.9 +#include "targetconditionals.h"
    2.10 +#if TARGET_OS_IPHONE
    2.11 +#undef __IPHONEOS__
    2.12 +#define __IPHONEOS__ 1
    2.13 +#undef __MACOSX__
    2.14 +#else
    2.15  #undef __MACOSX__
    2.16  #define __MACOSX__	1
    2.17 -#elif defined(macintosh)
    2.18 -#undef __MACOS__
    2.19 -#define __MACOS__	1
    2.20  #endif
    2.21 +#endif
    2.22 +
    2.23  #if defined(__NetBSD__)
    2.24  #undef __NETBSD__
    2.25  #define __NETBSD__	1
     3.1 --- a/include/SDL_stdinc.h	Thu Jun 19 17:24:30 2008 +0000
     3.2 +++ b/include/SDL_stdinc.h	Wed Jul 02 20:20:51 2008 +0000
     3.3 @@ -147,8 +147,8 @@
     3.4  SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2);
     3.5  SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4);
     3.6  SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4);
     3.7 -SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8);
     3.8 -SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8);
     3.9 +//SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8);
    3.10 +//SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8);
    3.11  #endif /* DOXYGEN_SHOULD_IGNORE_THIS */
    3.12  
    3.13  /* Check to make sure enums are the size of ints, for structure packing.