*** empty log message ***
authorSam Lantinga
Sat, 30 Mar 2002 21:41:01 +0000
changeset 324f25f666d609a
parent 323 b7e8038e40ae
child 325 1b5457c0a8ad
*** empty log message ***
src/audio/macrom/SDL_romaudio.c
src/video/quartz/SDL_QuartzVideo.m
src/video/quartz/SDL_QuartzWM.m
     1.1 --- a/src/audio/macrom/SDL_romaudio.c	Sat Mar 30 20:03:27 2002 +0000
     1.2 +++ b/src/audio/macrom/SDL_romaudio.c	Sat Mar 30 21:41:01 2002 +0000
     1.3 @@ -147,7 +147,7 @@
     1.4          return;
     1.5  
     1.6      /* Did we miss the chance to mix in an interrupt? Do it now. */
     1.7 -    if ( BitAndAtomic (0xFFFFFFFF, &need_to_mix) ) {
     1.8 +    if ( BitAndAtomic (0xFFFFFFFF, (UInt32 *) &need_to_mix) ) {
     1.9          /*
    1.10           * Note that this could be a problem if you missed an interrupt
    1.11           *  while the audio was locked, and get preempted by a second
    1.12 @@ -184,7 +184,7 @@
    1.13      * if audio device isn't locked, mix the next buffer to be queued in
    1.14      *  the memory block that just finished playing.
    1.15      */
    1.16 -   if ( ! BitAndAtomic(0xFFFFFFFF, &audio_is_locked) ) {
    1.17 +   if ( ! BitAndAtomic(0xFFFFFFFF, (UInt32 *) &audio_is_locked) ) {
    1.18        mix_buffer (audio, buffer[fill_me]);
    1.19     } 
    1.20  
     2.1 --- a/src/video/quartz/SDL_QuartzVideo.m	Sat Mar 30 20:03:27 2002 +0000
     2.2 +++ b/src/video/quartz/SDL_QuartzVideo.m	Sat Mar 30 21:41:01 2002 +0000
     2.3 @@ -1240,7 +1240,7 @@
     2.4          return 0;
     2.5      }
     2.6  
     2.7 -    glGetIntegerv (attr, value);
     2.8 +    glGetIntegerv (attr, (GLint *)value);
     2.9      return 0;
    2.10  }
    2.11  
     3.1 --- a/src/video/quartz/SDL_QuartzWM.m	Sat Mar 30 20:03:27 2002 +0000
     3.2 +++ b/src/video/quartz/SDL_QuartzWM.m	Sat Mar 30 21:41:01 2002 +0000
     3.3 @@ -231,9 +231,11 @@
     3.4       SDL_GetClipRect(icon, &rrect);
     3.5       /* create a big endian RGBA surface */
     3.6       mergedSurface = SDL_CreateRGBSurface(SDL_SWSURFACE|SDL_SRCALPHA, 
     3.7 -icon->w, icon->h, 32, 0xff<<24, 0xff<<16, 0xff<<8, 0xff<<0);
     3.8 -     if (mergedSurface==NULL) { NSLog(@"Error creating surface for 
     3.9 -merge"); goto freePool; }
    3.10 +                        icon->w, icon->h, 32, 0xff<<24, 0xff<<16, 0xff<<8, 0xff<<0);
    3.11 +     if (mergedSurface==NULL) {
    3.12 +        NSLog(@"Error creating surface for merge");
    3.13 +        goto freePool;
    3.14 +    }
    3.15       if (SDL_BlitSurface(icon,&rrect,mergedSurface,&rrect)) {
    3.16           NSLog(@"Error blitting to mergedSurface");
    3.17           goto freePool;