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 4369f14cf9d71233
parent 4368 4c088d2b29eb
child 4370 8d67936e32ec
Better fix for bug #861
src/cdrom/macosx/AudioFilePlayer.h
src/cdrom/macosx/CDPlayer.h
     1.1 --- a/src/cdrom/macosx/AudioFilePlayer.h	Tue Oct 20 03:45:06 2009 +0000
     1.2 +++ b/src/cdrom/macosx/AudioFilePlayer.h	Tue Oct 20 03:47:29 2009 +0000
     1.3 @@ -37,6 +37,10 @@
     1.4  #include <AudioUnit/AUNTComponent.h>
     1.5  #endif
     1.6  
     1.7 +#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1050
     1.8 +typedef SInt16 FSIORefNum;
     1.9 +#endif
    1.10 +
    1.11  #include "SDL_error.h"
    1.12  
    1.13  const char* AudioFilePlayerErrorStr (OSStatus error);
    1.14 @@ -80,12 +84,8 @@
    1.15  
    1.16  /*private:*/
    1.17      AudioUnit                       mPlayUnit;
    1.18 -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
    1.19      FSIORefNum                      mForkRefNum;
    1.20 -#else
    1.21 -    int                             mForkRefNum;
    1.22 -#endif
    1.23 -
    1.24 +    
    1.25      AURenderCallbackStruct          mInputCallback;
    1.26  
    1.27      AudioStreamBasicDescription     mFileDescription;
     2.1 --- a/src/cdrom/macosx/CDPlayer.h	Tue Oct 20 03:45:06 2009 +0000
     2.2 +++ b/src/cdrom/macosx/CDPlayer.h	Tue Oct 20 03:47:29 2009 +0000
     2.3 @@ -34,10 +34,6 @@
     2.4  #include "SDL_thread.h"
     2.5  #include "SDL_mutex.h"
     2.6  
     2.7 -#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1050
     2.8 -typedef SInt16 FSIORefNum;
     2.9 -#endif
    2.10 -
    2.11  #ifdef __cplusplus
    2.12  extern "C" {
    2.13  #endif