src/audio/SDL_mixer.c
branchSDL-1.2
changeset 5657 529d23724144
parent 4382 6599c89de50c
child 6137 4720145f848b
     1.1 --- a/src/audio/SDL_mixer.c	Sun Aug 28 19:33:40 2011 +0200
     1.2 +++ b/src/audio/SDL_mixer.c	Sun Aug 28 19:51:27 2011 +0200
     1.3 @@ -111,7 +111,7 @@
     1.4  	switch (format) {
     1.5  
     1.6  		case AUDIO_U8: {
     1.7 -#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
     1.8 +#if defined(__GNUC__) && (defined(__m68k__) && !defined(__mcoldfire__)) && defined(SDL_ASSEMBLY_ROUTINES)
     1.9  			SDL_MixAudio_m68k_U8((char*)dst,(char*)src,(unsigned long)len,(long)volume,(char *)mix8);
    1.10  #else
    1.11  			Uint8 src_sample;
    1.12 @@ -144,7 +144,7 @@
    1.13  #endif
    1.14  #endif
    1.15  
    1.16 -#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
    1.17 +#if defined(__GNUC__) && (defined(__m68k__) && !defined(__mcoldfire__)) && defined(SDL_ASSEMBLY_ROUTINES)
    1.18  			SDL_MixAudio_m68k_S8((char*)dst,(char*)src,(unsigned long)len,(long)volume);
    1.19  #else
    1.20  			{
    1.21 @@ -193,7 +193,7 @@
    1.22  #endif
    1.23  #endif
    1.24  
    1.25 -#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
    1.26 +#if defined(__GNUC__) && (defined(__m68k__) && !defined(__mcoldfire__)) && defined(SDL_ASSEMBLY_ROUTINES)
    1.27  			SDL_MixAudio_m68k_S16LSB((short*)dst,(short*)src,(unsigned long)len,(long)volume);
    1.28  #else
    1.29  			{
    1.30 @@ -226,7 +226,7 @@
    1.31  		break;
    1.32  
    1.33  		case AUDIO_S16MSB: {
    1.34 -#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
    1.35 +#if defined(__GNUC__) && (defined(__m68k__) && !defined(__mcoldfire__)) && defined(SDL_ASSEMBLY_ROUTINES)
    1.36  			SDL_MixAudio_m68k_S16MSB((short*)dst,(short*)src,(unsigned long)len,(long)volume);
    1.37  #else
    1.38  			Sint16 src1, src2;