From 1fb3c2744c70202f5262c2c5b0aa9672e4b62d34 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Tue, 20 Oct 2009 03:47:29 +0000
Subject: [PATCH] Better fix for bug #861

---
 src/cdrom/macosx/AudioFilePlayer.h | 10 +++++-----
 src/cdrom/macosx/CDPlayer.h        |  4 ----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/cdrom/macosx/AudioFilePlayer.h b/src/cdrom/macosx/AudioFilePlayer.h
index 392099211..6bd256e89 100644
--- a/src/cdrom/macosx/AudioFilePlayer.h
+++ b/src/cdrom/macosx/AudioFilePlayer.h
@@ -37,6 +37,10 @@
 #include <AudioUnit/AUNTComponent.h>
 #endif
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+typedef SInt16 FSIORefNum;
+#endif
+
 #include "SDL_error.h"
 
 const char* AudioFilePlayerErrorStr (OSStatus error);
@@ -80,12 +84,8 @@ typedef struct S_AudioFilePlayer
 
 /*private:*/
     AudioUnit                       mPlayUnit;
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
     FSIORefNum                      mForkRefNum;
-#else
-    int                             mForkRefNum;
-#endif
-
+    
     AURenderCallbackStruct          mInputCallback;
 
     AudioStreamBasicDescription     mFileDescription;
diff --git a/src/cdrom/macosx/CDPlayer.h b/src/cdrom/macosx/CDPlayer.h
index 8944ce793..b03c7108f 100644
--- a/src/cdrom/macosx/CDPlayer.h
+++ b/src/cdrom/macosx/CDPlayer.h
@@ -34,10 +34,6 @@
 #include "SDL_thread.h"
 #include "SDL_mutex.h"
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1050
-typedef SInt16 FSIORefNum;
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif