esigra 2010-04-17 03:53:57 PDT SDL-1.2
authorSam Lantinga <slouken@libsdl.org>
Fri, 23 Apr 2010 02:14:06 -0700
branchSDL-1.2
changeset 44387a53f8efc017
parent 4431 d660ca4f7b1f
child 4440 7bb8f748a14d
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
     1.1 --- a/include/SDL_endian.h	Tue Apr 13 21:46:10 2010 -0700
     1.2 +++ b/include/SDL_endian.h	Fri Apr 23 02:14:06 2010 -0700
     1.3 @@ -94,7 +94,7 @@
     1.4  }
     1.5  #else
     1.6  static __inline__ Uint16 SDL_Swap16(Uint16 x) {
     1.7 -	return (Uint16)((x<<8)|(x>>8));
     1.8 +	return SDL_static_cast(Uint16, ((x<<8)|(x>>8)));
     1.9  }
    1.10  #endif
    1.11  
    1.12 @@ -129,7 +129,7 @@
    1.13  }
    1.14  #else
    1.15  static __inline__ Uint32 SDL_Swap32(Uint32 x) {
    1.16 -	return (Uint32)((x<<24)|((x<<8)&0x00FF0000)|((x>>8)&0x0000FF00)|(x>>24));
    1.17 +	return SDL_static_cast(Uint32, ((x<<24)|((x<<8)&0x00FF0000)|((x>>8)&0x0000FF00)|(x>>24)));
    1.18  }
    1.19  #endif
    1.20