Fixed building with a newer Mac OS X SDK and -mmacosx-version-min=10.4. SDL-1.2
authorRyan C. Gordon <icculus@icculus.org>
Sun, 18 Sep 2011 02:00:39 -0400
branchSDL-1.2
changeset 5952 c838b121901e
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
--- a/src/cdrom/macosx/AudioFilePlayer.h	Fri Sep 16 01:55:46 2011 -0400
+++ b/src/cdrom/macosx/AudioFilePlayer.h	Sun Sep 18 02:00:39 2011 -0400
@@ -37,7 +37,8 @@
 #include <AudioUnit/AUNTComponent.h>
 #endif
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+/* This typedef is included in the 10.5+ SDK headers. */
+#ifndef MAC_OS_X_VERSION_10_5
 typedef SInt16 FSIORefNum;
 #endif
 
--- a/src/video/quartz/SDL_QuartzWindow.h	Fri Sep 16 01:55:46 2011 -0400
+++ b/src/video/quartz/SDL_QuartzWindow.h	Sun Sep 18 02:00:39 2011 -0400
@@ -21,7 +21,8 @@
 */
 #include "SDL_config.h"
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+/* this is defined in the 10.5+ SDK headers
+#ifndef MAC_OS_X_VERSION_10_5
 typedef unsigned int NSUInteger;
 #endif