Fixed building with a newer Mac OS X SDK and -mmacosx-version-min=10.4.

libsdl-org · Sep 18, 2011 · 02792b1816530e566552c4e5bfb5d4f707e42d88 · 02792b1
1 parent d834f01
commit 02792b1816530e566552c4e5bfb5d4f707e42d88
Unified Split

Showing with 4 additions and 2 deletions.

+2 −1 src/cdrom/macosx/AudioFilePlayer.h

+2 −1 src/video/quartz/SDL_QuartzWindow.h
diff --git a/src/cdrom/macosx/AudioFilePlayer.h b/src/cdrom/macosx/AudioFilePlayer.h
@@ -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
 

diff --git a/src/video/quartz/SDL_QuartzWindow.h b/src/video/quartz/SDL_QuartzWindow.h
@@ -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