Fixed building with a newer Mac OS X SDK and -mmacosx-version-min=10.4. SDL-1.2
authorRyan C. Gordon
Sun, 18 Sep 2011 02:00:39 -0400
branchSDL-1.2
changeset 5952c838b121901e
parent 5946 19520acd1501
child 5954 56547783eae2
Fixed building with a newer Mac OS X SDK and -mmacosx-version-min=10.4.
src/cdrom/macosx/AudioFilePlayer.h
src/video/quartz/SDL_QuartzWindow.h
     1.1 --- a/src/cdrom/macosx/AudioFilePlayer.h	Fri Sep 16 01:55:46 2011 -0400
     1.2 +++ b/src/cdrom/macosx/AudioFilePlayer.h	Sun Sep 18 02:00:39 2011 -0400
     1.3 @@ -37,7 +37,8 @@
     1.4  #include <AudioUnit/AUNTComponent.h>
     1.5  #endif
     1.6  
     1.7 -#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1050
     1.8 +/* This typedef is included in the 10.5+ SDK headers. */
     1.9 +#ifndef MAC_OS_X_VERSION_10_5
    1.10  typedef SInt16 FSIORefNum;
    1.11  #endif
    1.12  
     2.1 --- a/src/video/quartz/SDL_QuartzWindow.h	Fri Sep 16 01:55:46 2011 -0400
     2.2 +++ b/src/video/quartz/SDL_QuartzWindow.h	Sun Sep 18 02:00:39 2011 -0400
     2.3 @@ -21,7 +21,8 @@
     2.4  */
     2.5  #include "SDL_config.h"
     2.6  
     2.7 -#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1050
     2.8 +/* this is defined in the 10.5+ SDK headers
     2.9 +#ifndef MAC_OS_X_VERSION_10_5
    2.10  typedef unsigned int NSUInteger;
    2.11  #endif
    2.12