# HG changeset patch # User Sam Lantinga # Date 1256010449 0 # Node ID f14cf9d71233934811774f941d0de121d5f96ccf # Parent 4c088d2b29ebf90ba6a8f26bb024cf23ae78e475 Better fix for bug #861 diff -r 4c088d2b29eb -r f14cf9d71233 src/cdrom/macosx/AudioFilePlayer.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 #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; diff -r 4c088d2b29eb -r f14cf9d71233 src/cdrom/macosx/CDPlayer.h --- 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