Better fix for bug #861 SDL-1.2 release-1.2.14
authorSam Lantinga <slouken@libsdl.org>
Tue, 20 Oct 2009 03:47:29 +0000
branchSDL-1.2
changeset 4369 f14cf9d71233
parent 4368 4c088d2b29eb
child 4370 8d67936e32ec
Better fix for bug #861
src/cdrom/macosx/AudioFilePlayer.h
src/cdrom/macosx/CDPlayer.h
--- a/src/cdrom/macosx/AudioFilePlayer.h	Tue Oct 20 03:45:06 2009 +0000
+++ b/src/cdrom/macosx/AudioFilePlayer.h	Tue Oct 20 03:47:29 2009 +0000
@@ -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;
--- a/src/cdrom/macosx/CDPlayer.h	Tue Oct 20 03:45:06 2009 +0000
+++ b/src/cdrom/macosx/CDPlayer.h	Tue Oct 20 03:47:29 2009 +0000
@@ -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