Better fix for bug #861

libsdl-org · Oct 20, 2009 · 1fb3c2744c70202f5262c2c5b0aa9672e4b62d34 · 1fb3c27
1 parent 9523b7c
commit 1fb3c2744c70202f5262c2c5b0aa9672e4b62d34
Unified Split

Showing with 5 additions and 9 deletions.

+5 −5 src/cdrom/macosx/AudioFilePlayer.h

+0 −4 src/cdrom/macosx/CDPlayer.h
diff --git 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
@@ -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