From d063311b085adc62996cc3d53dc0cc64c6b6af3f Mon Sep 17 00:00:00 2001 From: Kent Mein Date: Tue, 29 Oct 2002 21:55:52 +0000 Subject: Fixed defined __sparc to also check for __sparc__ (thanks to Ferris) --- source/blender/avi/intern/avirgb.c | 5 +++++ source/blender/avi/intern/endian.c | 4 ++++ source/blender/blenkernel/BKE_utildefines.h | 2 +- source/blender/bpython/intern/api.h | 2 +- source/blender/imbuf/intern/amiga.c | 2 +- source/blender/imbuf/intern/hamx.c | 2 +- source/blender/imbuf/intern/imbuf.h | 2 +- source/blender/imbuf/intern/imbuf_patch.h | 2 +- source/blender/imbuf/intern/readimage.c | 2 +- source/blender/include/blendef.h | 4 ++-- source/blender/makesdna/DNA_ID.h | 2 +- source/blender/render/intern/include/render_intern.h | 2 +- 12 files changed, 20 insertions(+), 11 deletions(-) diff --git a/source/blender/avi/intern/avirgb.c b/source/blender/avi/intern/avirgb.c index 051c351a0f8..4ebf381e5bf 100644 --- a/source/blender/avi/intern/avirgb.c +++ b/source/blender/avi/intern/avirgb.c @@ -42,6 +42,11 @@ #include "MEM_guardedalloc.h" #include "avirgb.h" +#if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__) +#define WORDS_BIGENDIAN +#endif + + /* implementation */ void *avi_converter_from_avi_rgb (AviMovie *movie, int stream, unsigned char *buffer, int *size) { diff --git a/source/blender/avi/intern/endian.c b/source/blender/avi/intern/endian.c index 3308d05ce43..144e7ee86db 100644 --- a/source/blender/avi/intern/endian.c +++ b/source/blender/avi/intern/endian.c @@ -41,6 +41,10 @@ #include "AVI_avi.h" #include "endian.h" +#if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__) +#define WORDS_BIGENDIAN +#endif + static void invert (int *num) { int new=0,i,j; diff --git a/source/blender/blenkernel/BKE_utildefines.h b/source/blender/blenkernel/BKE_utildefines.h index 65bad0f40b3..41fdb128496 100644 --- a/source/blender/blenkernel/BKE_utildefines.h +++ b/source/blender/blenkernel/BKE_utildefines.h @@ -107,7 +107,7 @@ #endif /* INTEGER CODES */ -#if defined(__sgi) || defined (__sparc) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__) +#if defined(__sgi) || defined (__sparc) || defined (__SPARC__) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__) /* Big Endian */ #define MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) ) #else diff --git a/source/blender/bpython/intern/api.h b/source/blender/bpython/intern/api.h index 369e6175918..1de41039b9a 100644 --- a/source/blender/bpython/intern/api.h +++ b/source/blender/bpython/intern/api.h @@ -71,7 +71,7 @@ MODNAME(BLENDERMODULE) -> "_Blender" #define MODNAME(x) _MODNAME(x) // module configuration -- TODO: this should be set later from the Makefile... -#if defined(__FreeBSD__) || defined(__linux__) || defined (__sgi) || defined(__sparc) +#if defined(__FreeBSD__) || defined(__linux__) || defined (__sgi) || defined(__sparc) || defined(__sparc__) #define STATIC_TEXTTOOLS 1 #endif diff --git a/source/blender/imbuf/intern/amiga.c b/source/blender/imbuf/intern/amiga.c index ba699f90847..a006b415d9c 100644 --- a/source/blender/imbuf/intern/amiga.c +++ b/source/blender/imbuf/intern/amiga.c @@ -50,7 +50,7 @@ #define SWAP_S(x) (((x << 8) & 0xff00) | ((x >> 8) & 0xff)) /* more endianness... should move to a separate file... */ -#if defined(__sgi) || defined (__sparc) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__) +#if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__) #define GET_ID GET_BIG_LONG #define LITTLE_LONG SWAP_LONG #else diff --git a/source/blender/imbuf/intern/hamx.c b/source/blender/imbuf/intern/hamx.c index b297548fde6..69e686ecdfc 100644 --- a/source/blender/imbuf/intern/hamx.c +++ b/source/blender/imbuf/intern/hamx.c @@ -56,7 +56,7 @@ #define SWAP_S(x) (((x << 8) & 0xff00) | ((x >> 8) & 0xff)) /* more endianness... should move to a separate file... */ -#if defined(__sgi) || defined (__sparc) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__) +#if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__) #define GET_ID GET_BIG_LONG #define LITTLE_LONG SWAP_LONG #else diff --git a/source/blender/imbuf/intern/imbuf.h b/source/blender/imbuf/intern/imbuf.h index d22d408ddaa..6f610e744f9 100644 --- a/source/blender/imbuf/intern/imbuf.h +++ b/source/blender/imbuf/intern/imbuf.h @@ -69,7 +69,7 @@ #define ENDIAN_NOP(x) (x) -#if defined(__sgi) || defined(__sparc) || defined (__PPC__) || defined (__APPLE__) +#if defined(__sgi) || defined(__sparc) || defined(__sparc__) || defined (__PPC__) || defined (__APPLE__) #define LITTLE_SHORT SWAP_SHORT #define LITTLE_LONG SWAP_LONG #define BIG_SHORT ENDIAN_NOP diff --git a/source/blender/imbuf/intern/imbuf_patch.h b/source/blender/imbuf/intern/imbuf_patch.h index 9dbdc55969c..e8d8faa14a1 100644 --- a/source/blender/imbuf/intern/imbuf_patch.h +++ b/source/blender/imbuf/intern/imbuf_patch.h @@ -53,7 +53,7 @@ typedef unsigned char uchar; /* Endianness: flip the byte order. It's strange that this is needed.. * After all, there is an internal endian.{c,h}... */ -#if defined(__sgi) || defined (__sparc) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__) +#if defined(__sgi) || defined (__sparc) || defined(__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__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) ) diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c index ef9c7271d7b..9c8e42d0702 100644 --- a/source/blender/imbuf/intern/readimage.c +++ b/source/blender/imbuf/intern/readimage.c @@ -54,7 +54,7 @@ #define SWAP_S(x) (((x << 8) & 0xff00) | ((x >> 8) & 0xff)) /* more endianness... should move to a separate file... */ -#if defined(__sgi) || defined (__sparc) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__) +#if defined(__sgi) || defined (__sparc) || defined(__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__) #define GET_ID GET_BIG_LONG #define LITTLE_LONG SWAP_LONG #else diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h index 6d6b3904645..4639dc4b3df 100644 --- a/source/blender/include/blendef.h +++ b/source/blender/include/blendef.h @@ -90,7 +90,7 @@ #define LONGCOPY(a, b, c) {int lcpc=c, *lcpa=(int *)a, *lcpb=(int *)b; while(lcpc-->0) *(lcpa++)= *(lcpb++);} -#if defined(__sgi) || defined(__sparc) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__) +#if defined(__sgi) || defined(__sparc) || defined(__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__) /* big endian */ #define MAKE_ID2(c, d) ( (c)<<8 | (d) ) #define MOST_SIG_BYTE 0 @@ -381,7 +381,7 @@ -#if defined(__sgi) || defined(__sparc) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__) +#if defined(__sgi) || defined(__sparc) || defined(__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__) #define RCOMP 3 #define GCOMP 2 #define BCOMP 1 diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 9800f4a5f31..4c87bec869f 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -84,7 +84,7 @@ typedef struct Library { * **/ -#if defined(__sgi) || defined(__sparc) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__) +#if defined(__sgi) || defined(__sparc) || defined(__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__) /* big endian */ #define MAKE_ID2(c, d) ( (c)<<8 | (d) ) #define MOST_SIG_BYTE 0 diff --git a/source/blender/render/intern/include/render_intern.h b/source/blender/render/intern/include/render_intern.h index 1f058821b2b..1d980aae274 100644 --- a/source/blender/render/intern/include/render_intern.h +++ b/source/blender/render/intern/include/render_intern.h @@ -37,7 +37,7 @@ * regular (non-file related) endian dependant * code. */ -#if defined(__sgi) || defined(__sparc) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__) +#if defined(__sgi) || defined(__sparc) || defined(__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__) #define RCOMP 3 #define GCOMP 2 #define BCOMP 1 -- cgit v1.2.3