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 | 8a2c5e0271f8be5a61dd19ab0c3c45861d25e649 (patch) | |
| tree | 4fbed877665cfd940aa7a243b2ab8d0ddc1f68ef /include/SDL_endian.h | |
| parent | 3c0d82a1bf53f37631f8e204d23f6f9b0052466b (diff) | |
| download | sdl-8a2c5e0271f8be5a61dd19ab0c3c45861d25e649.tar.gz | |
Merged r5194:5195 from branches/SDL-1.2: coldfire cpu arch support.
Diffstat (limited to 'include/SDL_endian.h')
| -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 436dec476..e2e7007db 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) { |