Squelch redefinition warnings

This commit is contained in:
Jack Andersen 2016-12-16 13:05:11 -10:00
parent 121f566848
commit 3d4355182f
1 changed files with 8 additions and 0 deletions

View File

@ -1418,8 +1418,10 @@ static inline double SBig(double val)
int64_t ival = bswap64(*((int64_t*)(&val))); int64_t ival = bswap64(*((int64_t*)(&val)));
return *((double*)(&ival)); return *((double*)(&ival));
} }
#ifndef SBIG
#define SBIG(q) ( ( (q) & 0x000000FF ) << 24 | ( (q) & 0x0000FF00 ) << 8 \ #define SBIG(q) ( ( (q) & 0x000000FF ) << 24 | ( (q) & 0x0000FF00 ) << 8 \
| ( (q) & 0x00FF0000 ) >> 8 | ( (q) & 0xFF000000 ) >> 24 ) | ( (q) & 0x00FF0000 ) >> 8 | ( (q) & 0xFF000000 ) >> 24 )
#endif
static inline int16_t SLittle(int16_t val) {return val;} static inline int16_t SLittle(int16_t val) {return val;}
static inline uint16_t SLittle(uint16_t val) {return val;} static inline uint16_t SLittle(uint16_t val) {return val;}
@ -1429,7 +1431,9 @@ static inline int64_t SLittle(int64_t val) {return val;}
static inline uint64_t SLittle(uint64_t val) {return val;} static inline uint64_t SLittle(uint64_t val) {return val;}
static inline float SLittle(float val) {return val;} static inline float SLittle(float val) {return val;}
static inline double SLittle(double val) {return val;} static inline double SLittle(double val) {return val;}
#ifndef SLITTLE
#define SLITTLE(q) (q) #define SLITTLE(q) (q)
#endif
#else #else
static inline int16_t SLittle(int16_t val) {return bswap16(val);} static inline int16_t SLittle(int16_t val) {return bswap16(val);}
static inline uint16_t SLittle(uint16_t val) {return bswap16(val);} static inline uint16_t SLittle(uint16_t val) {return bswap16(val);}
@ -1447,8 +1451,10 @@ static inline double SLittle(double val)
int64_t ival = bswap64(*((int64_t*)(&val))); int64_t ival = bswap64(*((int64_t*)(&val)));
return *((double*)(&ival)); return *((double*)(&ival));
} }
#ifndef SLITTLE
#define SLITTLE(q) ( ( (q) & 0x000000FF ) << 24 | ( (q) & 0x0000FF00 ) << 8 \ #define SLITTLE(q) ( ( (q) & 0x000000FF ) << 24 | ( (q) & 0x0000FF00 ) << 8 \
| ( (q) & 0x00FF0000 ) >> 8 | ( (q) & 0xFF000000 ) >> 24 ) | ( (q) & 0x00FF0000 ) >> 8 | ( (q) & 0xFF000000 ) >> 24 )
#endif
static inline int16_t SBig(int16_t val) {return val;} static inline int16_t SBig(int16_t val) {return val;}
static inline uint16_t SBig(uint16_t val) {return val;} static inline uint16_t SBig(uint16_t val) {return val;}
@ -1458,8 +1464,10 @@ static inline int64_t SBig(int64_t val) {return val;}
static inline uint64_t SBig(uint64_t val) {return val;} static inline uint64_t SBig(uint64_t val) {return val;}
static inline float SBig(float val) {return val;} static inline float SBig(float val) {return val;}
static inline double SBig(double val) {return val;} static inline double SBig(double val) {return val;}
#ifndef SBIG
#define SBIG(q) (q) #define SBIG(q) (q)
#endif #endif
#endif
} }