diff src/audio/SDL_mixer_m68k.c @ 3630:efb79807afe1

Merged r5194:5195 from branches/SDL-1.2: coldfire cpu arch support.
author Ryan C. Gordon <icculus@icculus.org>
date Sun, 10 Jan 2010 08:21:19 +0000
parents 99210400e8b9
children f7b03b6838cb
line wrap: on
line diff
--- a/src/audio/SDL_mixer_m68k.c	Sun Jan 10 08:15:25 2010 +0000
+++ b/src/audio/SDL_mixer_m68k.c	Sun Jan 10 08:21:19 2010 +0000
@@ -27,7 +27,7 @@
 	Patrice Mandin
 */
 
-#if defined(__M68000__) && defined(__GNUC__)
+#if defined(__M68000__) && !defined(__mcoldfire__) && defined(__GNUC__)
 void
 SDL_MixAudio_m68k_U8(char *dst, char *src, long len, long volume, char *mix8)
 {