From f3ce109d4d834691adeb75e55c99e5958478f4a6 Mon Sep 17 00:00:00 2001 From: Alex Marshall Date: Thu, 19 Feb 2009 22:55:10 -0800 Subject: Fixed endian.h and .c to be more logical (no more functions in headers) which should also make it work correctly on Windblows systems. (Also, I fixed all the warnings! =D) --- endian.h | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) (limited to 'endian.h') diff --git a/endian.h b/endian.h index 4c12e6b..51ce90f 100755 --- a/endian.h +++ b/endian.h @@ -7,32 +7,12 @@ //#define be32(x) ((x>>24)|((x<<8)&0x00FF0000)|((x>>8)&0x0000FF00)|(x<<24)) //#define be64(x) ((x>>56)|((x<<40)&(u64)0x00FF000000000000)|((x<<24)&(u64)0x0000FF0000000000)|((x<<8)&(u64)0x000000FF00000000)|((x>>8)&(u64)0x00000000FF000000)|((x>>24)&(u64)0x0000000000FF0000)|((x<<40)&(u64)0x000000000000FF00)|(x<<56)) -u16 be16(u16 x) -{ - return (x>>8) | - (x<<8); -} +u16 be16(u16 x); -u32 be32(u32 x) -{ - return (x>>24) | - ((x<<8) & 0x00FF0000) | - ((x>>8) & 0x0000FF00) | - (x<<24); -} +u32 be32(u32 x); // __int64 for MSVC, "long long" for gcc -u64 be64(u64 x) -{ - return (x>>56) | - ((x<<40) & (u64)0x00FF000000000000) | - ((x<<24) & (u64)0x0000FF0000000000) | - ((x<<8) & (u64)0x000000FF00000000) | - ((x>>8) & (u64)0x00000000FF000000) | - ((x>>24) & (u64)0x0000000000FF0000) | - ((x>>40) & (u64)0x000000000000FF00) | - (x<<56); -} +u64 be64(u64 x); #endif //_ENDIAN_H_ -- cgit v1.3.1