diff options
| author | Ryan C. Gordon <icculus@icculus.org> | 2010-01-10 08:21:19 +0000 |
|---|---|---|
| committer | Ryan C. Gordon <icculus@icculus.org> | 2010-01-10 08:21:19 +0000 |
| commit | 33bfbef988813b7fa918143ac840130d830fd6f4 (patch) | |
| tree | 4fbed877665cfd940aa7a243b2ab8d0ddc1f68ef /include | |
| parent | b85e22a7e30242be0ff215698863ef19a92b8243 (diff) | |
Merged r5194:5195 from branches/SDL-1.2: coldfire cpu arch support.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404381
Diffstat (limited to 'include')
| -rw-r--r-- | include/SDL_endian.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/SDL_endian.h b/include/SDL_endian.h index 436dec47..e2e7007d 100644 --- a/include/SDL_endian.h +++ b/include/SDL_endian.h @@ -92,7 +92,7 @@ SDL_Swap16(Uint16 x) __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 @@ SDL_Swap32(Uint32 x) __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) { |