diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-09-19 12:02:17 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-19 12:02:17 +0400 |
commit | 83a2f02a78cd01aaf31b9b4ae8a217a1ecea6a49 (patch) | |
tree | 9a2b9e2d5aa4f5b5bc4835848c3dc78029643d9a /intern | |
parent | 425a81a29b8adf1fc2d913dfc679d6ca62cd05fa (diff) |
cleanup endian handling
- define __BIG_ENDIAN__ or __LITTLE_ENDIAN__ with cmake & scons.
- ENDIAN_ORDER is now a define rather than a global short.
- replace checks like this with single ifdef: #if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__hppa__) || defined (__BIG_ENDIAN__)
- remove BKE_endian.h which isn't used
Diffstat (limited to 'intern')
-rw-r--r-- | intern/audaspace/intern/AUD_ConverterReader.cpp | 12 | ||||
-rw-r--r-- | intern/audaspace/intern/AUD_Mixer.cpp | 13 | ||||
-rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 6 | ||||
-rw-r--r-- | intern/string/intern/STR_String.cpp | 2 |
4 files changed, 15 insertions, 18 deletions
diff --git a/intern/audaspace/intern/AUD_ConverterReader.cpp b/intern/audaspace/intern/AUD_ConverterReader.cpp index b3d669379f8..7665f276c0a 100644 --- a/intern/audaspace/intern/AUD_ConverterReader.cpp +++ b/intern/audaspace/intern/AUD_ConverterReader.cpp @@ -36,9 +36,6 @@ AUD_ConverterReader::AUD_ConverterReader(AUD_Reference<AUD_IReader> reader, AUD_EffectReader(reader), m_format(specs.format) { - int bigendian = 1; - bigendian = (((char*)&bigendian)[0]) ? 0: 1; // 1 if Big Endian - switch(m_format) { case AUD_FORMAT_U8: @@ -48,10 +45,11 @@ AUD_ConverterReader::AUD_ConverterReader(AUD_Reference<AUD_IReader> reader, m_convert = AUD_convert_float_s16; break; case AUD_FORMAT_S24: - if(bigendian) - m_convert = AUD_convert_float_s24_be; - else - m_convert = AUD_convert_float_s24_le; +#ifdef __BIG_ENDIAN__ + m_convert = AUD_convert_float_s24_be; +#else + m_convert = AUD_convert_float_s24_le; +#endif break; case AUD_FORMAT_S32: m_convert = AUD_convert_float_s32; diff --git a/intern/audaspace/intern/AUD_Mixer.cpp b/intern/audaspace/intern/AUD_Mixer.cpp index 74ff180627a..caeeac8d43c 100644 --- a/intern/audaspace/intern/AUD_Mixer.cpp +++ b/intern/audaspace/intern/AUD_Mixer.cpp @@ -37,9 +37,6 @@ AUD_Mixer::AUD_Mixer(AUD_DeviceSpecs specs) : m_specs(specs) { - int bigendian = 1; - bigendian = (((char*)&bigendian)[0]) ? 0: 1; // 1 if Big Endian - switch(m_specs.format) { case AUD_FORMAT_U8: @@ -49,10 +46,12 @@ AUD_Mixer::AUD_Mixer(AUD_DeviceSpecs specs) : m_convert = AUD_convert_float_s16; break; case AUD_FORMAT_S24: - if(bigendian) - m_convert = AUD_convert_float_s24_be; - else - m_convert = AUD_convert_float_s24_le; + +#ifdef __BIG_ENDIAN__ + m_convert = AUD_convert_float_s24_be; +#else + m_convert = AUD_convert_float_s24_le; +#endif break; case AUD_FORMAT_S32: m_convert = AUD_convert_float_s32; diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index 2421c25398a..c3ff851f3bc 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -124,10 +124,10 @@ static const char *check_memlist(MemHead *memh); /* locally used defines */ /* --------------------------------------------------------------------- */ -#if defined( __sgi) || defined (__sun) || defined (__sun__) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || (defined (__APPLE__) && !defined(__LITTLE_ENDIAN__)) -#define MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) ) +#ifdef __BIG_ENDIAN__ +# define MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) ) #else -#define MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) ) +# define MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) ) #endif #define MEMTAG1 MAKE_ID('M', 'E', 'M', 'O') diff --git a/intern/string/intern/STR_String.cpp b/intern/string/intern/STR_String.cpp index 071f34e0ef9..ba097ba6046 100644 --- a/intern/string/intern/STR_String.cpp +++ b/intern/string/intern/STR_String.cpp @@ -45,7 +45,7 @@ #include <ctype.h> #include <string.h> #if defined(__sun__) || defined( __sun ) || defined (__sparc) || defined (__sparc__) || defined (_AIX) -#include <strings.h> +# include <strings.h> #endif #include "STR_String.h" |