From 02792b1816530e566552c4e5bfb5d4f707e42d88 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Sun, 18 Sep 2011 02:00:39 -0400
Subject: [PATCH] Fixed building with a newer Mac OS X SDK and
 -mmacosx-version-min=10.4.

---
 src/cdrom/macosx/AudioFilePlayer.h  | 3 ++-
 src/video/quartz/SDL_QuartzWindow.h | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/cdrom/macosx/AudioFilePlayer.h b/src/cdrom/macosx/AudioFilePlayer.h
index 6bd256e89..b4f4d3493 100644
--- 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
index ce850251d..cd890a48b 100644
--- 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