diff --git a/src/audio/macrom/SDL_romaudio.c b/src/audio/macrom/SDL_romaudio.c index 4f4eb7a4b..af1e19284 100644 --- a/src/audio/macrom/SDL_romaudio.c +++ b/src/audio/macrom/SDL_romaudio.c @@ -147,7 +147,7 @@ static void Mac_UnlockAudio(_THIS) return; /* Did we miss the chance to mix in an interrupt? Do it now. */ - if ( BitAndAtomic (0xFFFFFFFF, &need_to_mix) ) { + if ( BitAndAtomic (0xFFFFFFFF, (UInt32 *) &need_to_mix) ) { /* * Note that this could be a problem if you missed an interrupt * while the audio was locked, and get preempted by a second @@ -184,7 +184,7 @@ static void callBackProc (SndChannel *chan, SndCommand *cmd_passed ) { * if audio device isn't locked, mix the next buffer to be queued in * the memory block that just finished playing. */ - if ( ! BitAndAtomic(0xFFFFFFFF, &audio_is_locked) ) { + if ( ! BitAndAtomic(0xFFFFFFFF, (UInt32 *) &audio_is_locked) ) { mix_buffer (audio, buffer[fill_me]); } diff --git a/src/video/quartz/SDL_QuartzVideo.m b/src/video/quartz/SDL_QuartzVideo.m index 7fc528790..a16295033 100644 --- a/src/video/quartz/SDL_QuartzVideo.m +++ b/src/video/quartz/SDL_QuartzVideo.m @@ -1240,7 +1240,7 @@ static int QZ_GL_GetAttribute (_THIS, SDL_GLattr attrib, int* value) { return 0; } - glGetIntegerv (attr, value); + glGetIntegerv (attr, (GLint *)value); return 0; } diff --git a/src/video/quartz/SDL_QuartzWM.m b/src/video/quartz/SDL_QuartzWM.m index 4a86e16f8..a4dbf8313 100644 --- a/src/video/quartz/SDL_QuartzWM.m +++ b/src/video/quartz/SDL_QuartzWM.m @@ -231,9 +231,11 @@ static void QZ_SetIcon (_THIS, SDL_Surface *icon, Uint8 *mask) SDL_GetClipRect(icon, &rrect); /* create a big endian RGBA surface */ mergedSurface = SDL_CreateRGBSurface(SDL_SWSURFACE|SDL_SRCALPHA, -icon->w, icon->h, 32, 0xff<<24, 0xff<<16, 0xff<<8, 0xff<<0); - if (mergedSurface==NULL) { NSLog(@"Error creating surface for -merge"); goto freePool; } + icon->w, icon->h, 32, 0xff<<24, 0xff<<16, 0xff<<8, 0xff<<0); + if (mergedSurface==NULL) { + NSLog(@"Error creating surface for merge"); + goto freePool; + } if (SDL_BlitSurface(icon,&rrect,mergedSurface,&rrect)) { NSLog(@"Error blitting to mergedSurface"); goto freePool;