1.1 --- a/include/SDL_platform.h	Sat Jun 08 14:34:09 2013 -0400
     1.2 +++ b/include/SDL_platform.h	Mon Aug 12 22:29:55 2013 -0400
     1.3 @@ -21,7 +21,7 @@
     1.4  
     1.5  /**
     1.6   *  \file SDL_platform.h
     1.7 - *  
     1.8 + *
     1.9   *  Try to get a standard set of platform defines.
    1.10   */
    1.11  
    1.12 @@ -30,39 +30,39 @@
    1.13  
    1.14  #if defined(_AIX)
    1.15  #undef __AIX__
    1.16 -#define __AIX__		1
    1.17 +#define __AIX__     1
    1.18  #endif
    1.19  #if defined(__BEOS__)
    1.20  #undef __BEOS__
    1.21 -#define __BEOS__	1
    1.22 +#define __BEOS__    1
    1.23  #endif
    1.24  #if defined(__HAIKU__)
    1.25  #undef __HAIKU__
    1.26 -#define __HAIKU__	1
    1.27 +#define __HAIKU__   1
    1.28  #endif
    1.29  #if defined(bsdi) || defined(__bsdi) || defined(__bsdi__)
    1.30  #undef __BSDI__
    1.31 -#define __BSDI__	1
    1.32 +#define __BSDI__    1
    1.33  #endif
    1.34  #if defined(_arch_dreamcast)
    1.35  #undef __DREAMCAST__
    1.36 -#define __DREAMCAST__	1
    1.37 +#define __DREAMCAST__   1
    1.38  #endif
    1.39  #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
    1.40  #undef __FREEBSD__
    1.41 -#define __FREEBSD__	1
    1.42 +#define __FREEBSD__ 1
    1.43  #endif
    1.44  #if defined(hpux) || defined(__hpux) || defined(__hpux__)
    1.45  #undef __HPUX__
    1.46 -#define __HPUX__	1
    1.47 +#define __HPUX__    1
    1.48  #endif
    1.49  #if defined(sgi) || defined(__sgi) || defined(__sgi__) || defined(_SGI_SOURCE)
    1.50  #undef __IRIX__
    1.51 -#define __IRIX__	1
    1.52 +#define __IRIX__    1
    1.53  #endif
    1.54  #if defined(linux) || defined(__linux) || defined(__linux__)
    1.55  #undef __LINUX__
    1.56 -#define __LINUX__	1
    1.57 +#define __LINUX__   1
    1.58  #endif
    1.59  #if defined(ANDROID)
    1.60  #undef __ANDROID__
    1.61 @@ -82,72 +82,57 @@
    1.62  #else
    1.63  /* if not compiling for iPhone */
    1.64  #undef __MACOSX__
    1.65 -#define __MACOSX__	1
    1.66 +#define __MACOSX__  1
    1.67 +#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050
    1.68 +# error SDL for Mac OS X only supports deploying on 10.5 and above.
    1.69 +#endif /* MAC_OS_X_VERSION_MIN_REQUIRED < 1050 */
    1.70 +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
    1.71 +# error SDL for Mac OS X must be built with a 10.6 SDK or above.
    1.72 +#endif /* MAC_OS_X_VERSION_MAX_ALLOWED < 1060 */
    1.73  #endif /* TARGET_OS_IPHONE */
    1.74  #endif /* defined(__APPLE__) */
    1.75  
    1.76  #if defined(__NetBSD__)
    1.77  #undef __NETBSD__
    1.78 -#define __NETBSD__	1
    1.79 +#define __NETBSD__  1
    1.80  #endif
    1.81  #if defined(__OpenBSD__)
    1.82  #undef __OPENBSD__
    1.83 -#define __OPENBSD__	1
    1.84 +#define __OPENBSD__ 1
    1.85  #endif
    1.86  #if defined(__OS2__)
    1.87  #undef __OS2__
    1.88 -#define __OS2__		1
    1.89 +#define __OS2__     1
    1.90  #endif
    1.91  #if defined(osf) || defined(__osf) || defined(__osf__) || defined(_OSF_SOURCE)
    1.92  #undef __OSF__
    1.93 -#define __OSF__		1
    1.94 +#define __OSF__     1
    1.95  #endif
    1.96  #if defined(__QNXNTO__)
    1.97  #undef __QNXNTO__
    1.98 -#define __QNXNTO__	1
    1.99 +#define __QNXNTO__  1
   1.100  #endif
   1.101  #if defined(riscos) || defined(__riscos) || defined(__riscos__)
   1.102  #undef __RISCOS__
   1.103 -#define __RISCOS__	1
   1.104 +#define __RISCOS__  1
   1.105  #endif
   1.106  #if defined(__SVR4)
   1.107  #undef __SOLARIS__
   1.108 -#define __SOLARIS__	1
   1.109 +#define __SOLARIS__ 1
   1.110  #endif
   1.111 -
   1.112 -#if defined(WIN32) || defined(_WIN32)
   1.113 -/* Try to find out what version of Windows we are compiling for */
   1.114 -#if defined(_MSC_VER) && (_MSC_VER >= 1700)	/* _MSC_VER==1700 for MSVC 2012 */
   1.115 -#include <winapifamily.h>
   1.116 -#endif
   1.117 -/* Default to classic, Win32 / Desktop compilation if the version of Windows
   1.118 -   cannot be determined via winapifamily.h. */
   1.119 -#if ! defined(WINAPI_FAMILY_PARTITION)
   1.120 +#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__)
   1.121  #undef __WIN32__
   1.122 -#define __WIN32__ 1
   1.123 -#else
   1.124 -/* Include Win32 / Desktop App APIs in SDL, if available: */
   1.125 -#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
   1.126 -#undef __WIN32__
   1.127 -#define __WIN32__ 1
   1.128 -#elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
   1.129 -/* Include WinRT / Windows Store APIs in SDL, if available: */
   1.130 -#undef __WINRT__
   1.131 -#define __WINRT__ 1
   1.132 +#define __WIN32__   1
   1.133  #endif
   1.134 -#endif /* if ! defined(WINAPI_FAMILY_PARTITION) ; else */
   1.135 -#endif /* if defined(WIN32) || defined(_WIN32) */
   1.136 -
   1.137  #if defined(__PSP__)
   1.138 -#define __PSP__	1
   1.139 +#undef __PSP__
   1.140 +#define __PSP__ 1
   1.141  #endif
   1.142  
   1.143  #include "begin_code.h"
   1.144  /* Set up for C function definitions, even when using C++ */
   1.145  #ifdef __cplusplus
   1.146 -/* *INDENT-OFF* */
   1.147  extern "C" {
   1.148 -/* *INDENT-ON* */
   1.149  #endif
   1.150  
   1.151  /**
   1.152 @@ -157,9 +142,7 @@
   1.153  
   1.154  /* Ends C function definitions when using C++ */
   1.155  #ifdef __cplusplus
   1.156 -/* *INDENT-OFF* */
   1.157  }
   1.158 -/* *INDENT-ON* */
   1.159  #endif
   1.160  #include "close_code.h"
   1.161