From 9523b7ceade0b4311891b46799561ddea5c5ef0a Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 20 Oct 2009 03:45:06 +0000 Subject: [PATCH] Fixed bug #861 C.W. Betts 2009-10-19 19:16:41 PDT In 64-bit libraries, the fork reference is a different size than in 32-bit. Apple has tried to help this transition by making a typedef called FSIORefNum, but it is only available in Mac OS X 10.5 headers or later. I first noticed this bug in Mac OS X's CD player code, and the patch is set to fix it accordingly. This might also be an issue in SDL_QuartzVideo.m --- src/cdrom/macosx/AudioFilePlayer.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/cdrom/macosx/AudioFilePlayer.h b/src/cdrom/macosx/AudioFilePlayer.h index adb459ca2..392099211 100644 --- a/src/cdrom/macosx/AudioFilePlayer.h +++ b/src/cdrom/macosx/AudioFilePlayer.h @@ -80,8 +80,12 @@ typedef struct S_AudioFilePlayer /*private:*/ AudioUnit mPlayUnit; - SInt16 mForkRefNum; - +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 + FSIORefNum mForkRefNum; +#else + int mForkRefNum; +#endif + AURenderCallbackStruct mInputCallback; AudioStreamBasicDescription mFileDescription;