commit 6707ee11a08e583d18f9d6a151396421f77fe41e
author Sam Lantinga <slouken@libsdl.org> Tue Oct 20 03:47:29 2009 +0000
committer Sam Lantinga <slouken@libsdl.org> Tue Oct 20 03:47:29 2009 +0000
tree 6e782cc652d7c10f45f69623ea6a0b5bcf5c2afb
parent 92ee1b2c17539e0cae997ff0fa82d6813547fe34

Better fix for bug #861

src/cdrom/macosx/AudioFilePlayer.h

diff --git a/src/cdrom/macosx/AudioFilePlayer.h b/src/cdrom/macosx/AudioFilePlayer.h
index 3920992..6bd256e 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 @@
 
 /*private:*/
     AudioUnit                       mPlayUnit;
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
     FSIORefNum                      mForkRefNum;
-#else
-    int                             mForkRefNum;
-#endif
-
+    
     AURenderCallbackStruct          mInputCallback;
 
     AudioStreamBasicDescription     mFileDescription;

src/cdrom/macosx/CDPlayer.h

diff --git a/src/cdrom/macosx/CDPlayer.h b/src/cdrom/macosx/CDPlayer.h
index 8944ce7..b03c710 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