diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-07-03 23:50:53 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-07-03 23:50:53 +0400 |
| commit | 64ff9ae4a846deb780c186893267f11bc40465d5 (patch) | |
| tree | 68f16ee688a988f09dd15fcaf8f5938e84475813 /intern/guardedalloc | |
| parent | d55b5240b9eb26429a2cadea055c904b032b90d0 (diff) | |
Mac intel commit
- patch from Douglas with endian fixes
- Makefile adds static libiconv.a from lib/
- this version will use OpenEXR libs from lib/ too, and is latest release
with threading support
- openAL is missing, added it as default to not include it
Diffstat (limited to 'intern/guardedalloc')
| -rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index fc345eee5a8..39cf77fc72e 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -93,7 +93,7 @@ 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__) +#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) ) #else #define MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) ) |