esigra 2010-04-17 03:53:57 PDT

If this header file is supposed to be includable from C++ code, the code should
of course use one of the SDL_*_cast macros from SDL_stdinc.h.

include/SDL_endian.h

@@ -103,7 +103,7 @@ SDL_Swap16(Uint16 x)
 static __inline__ Uint16
 SDL_Swap16(Uint16 x)
 {
-    return (Uint16)((x << 8) | (x >> 8));
+    return SDL_static_cast(Uint16, ((x << 8) | (x >> 8)));
 }
 #endif
 
@@ -143,8 +143,8 @@ SDL_Swap32(Uint32 x)
 static __inline__ Uint32
 SDL_Swap32(Uint32 x)
 {
-    return (Uint32)((x << 24) | ((x << 8) & 0x00FF0000) |
-                    ((x >> 8) & 0x0000FF00) | (x >> 24));
+    return SDL_static_cast(Uint32, ((x << 24) | ((x << 8) & 0x00FF0000) |
+                                    ((x >> 8) & 0x0000FF00) | (x >> 24)));
 }
 #endif