Mercurial > sdl-ios-xcode

diff include/SDL_endian.h @ 3630:efb79807afe1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 d3baf5ac4e37
children f7b03b6838cb
line wrap: on
line diff
--- a/include/SDL_endian.h	Sun Jan 10 08:15:25 2010 +0000
+++ b/include/SDL_endian.h	Sun Jan 10 08:21:19 2010 +0000
@@ -92,7 +92,7 @@
   __asm__("rlwimi %0,%2,8,16,23": "=&r"(result):"0"(x >> 8), "r"(x));
     return result;
 }
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
+#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
 static __inline__ Uint16
 SDL_Swap16(Uint16 x)
 {
@@ -132,7 +132,7 @@
   __asm__("rlwimi %0,%2,24,0,7": "=&r"(result):"0"(result), "r"(x));
     return result;
 }
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
+#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
 static __inline__ Uint32
 SDL_Swap32(Uint32 x)
 {