--- a/src/audio/macrom/SDL_romaudio.c Sat Mar 30 20:03:27 2002 +0000
+++ b/src/audio/macrom/SDL_romaudio.c Sat Mar 30 21:41:01 2002 +0000
@@ -147,7 +147,7 @@
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 @@
* 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]);
}
--- a/src/video/quartz/SDL_QuartzVideo.m Sat Mar 30 20:03:27 2002 +0000
+++ b/src/video/quartz/SDL_QuartzVideo.m Sat Mar 30 21:41:01 2002 +0000
@@ -1240,7 +1240,7 @@
return 0;
}
- glGetIntegerv (attr, value);
+ glGetIntegerv (attr, (GLint *)value);
return 0;
}
--- a/src/video/quartz/SDL_QuartzWM.m Sat Mar 30 20:03:27 2002 +0000
+++ b/src/video/quartz/SDL_QuartzWM.m Sat Mar 30 21:41:01 2002 +0000
@@ -231,9 +231,11 @@
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;