From 9ed44360585ce8bd1008d8609ffdae55b8008bec Mon Sep 17 00:00:00 2001 From: Kent Mein Date: Sat, 6 Mar 2004 19:32:33 +0000 Subject: [PATCH] Updated the Sun ifdef's basically I standardized them so they were all the same and make sure all platforms see them. Kent --- intern/guardedalloc/intern/mallocn.c | 2 +- source/blender/blenkernel/BKE_utildefines.h | 2 +- source/blender/blenlib/intern/arithb.c | 2 +- source/blender/blenlib/intern/matrixops.c | 2 +- source/blender/blenlib/intern/storage.c | 4 ++-- source/blender/imbuf/intern/IMB_anim.h | 2 +- source/blender/imbuf/intern/readimage.c | 2 +- source/blender/src/drawmesh.c | 2 +- source/blender/src/drawobject.c | 2 +- source/blender/src/interface.c | 3 ++- source/blender/src/toolbox.c | 3 ++- 11 files changed, 14 insertions(+), 12 deletions(-) diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index 6d74c478f40..83bd1f59161 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -87,7 +87,7 @@ static char *check_memlist(MemHead *memh); /* locally used defines */ /* --------------------------------------------------------------------- */ -#if defined( __sgi) || defined (__sun__) || defined (__PPC__) || defined (__APPLE__) +#if defined( __sgi) || defined (__sun) || defined (__sun__) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__APPLE__) #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/blenkernel/BKE_utildefines.h b/source/blender/blenkernel/BKE_utildefines.h index 4fae54369c1..92b29a59f1f 100644 --- a/source/blender/blenkernel/BKE_utildefines.h +++ b/source/blender/blenkernel/BKE_utildefines.h @@ -106,7 +106,7 @@ #endif /* INTEGER CODES */ -#if defined(__sgi) || defined (__sparc) || 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/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c index 70f24219249..61fe4358fa4 100644 --- a/source/blender/blenlib/intern/arithb.c +++ b/source/blender/blenlib/intern/arithb.c @@ -49,7 +49,7 @@ #include #endif -#ifdef __sun__ +#if defined(__sun__) || defined( __sun ) || defined (__sparc) || defined (__sparc__) #include #endif diff --git a/source/blender/blenlib/intern/matrixops.c b/source/blender/blenlib/intern/matrixops.c index e7f360252ba..52a66d105db 100644 --- a/source/blender/blenlib/intern/matrixops.c +++ b/source/blender/blenlib/intern/matrixops.c @@ -50,7 +50,7 @@ #include "BLI_winstuff.h" #endif -#ifdef __sun__ +#if defined(__sun__) || defined( __sun ) || defined (__sparc) || defined (__sparc__) #include #endif diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index e6319a22ba8..a71a470777c 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -56,7 +56,7 @@ #include #include -#if defined(__sgi) || defined(__sun__) || defined(__sun) +#if defined(__sgi) || defined(__sun__) || defined(__sun) || defined(__sparc) || defined(__sparc__) #include #endif @@ -199,7 +199,7 @@ double BLI_diskfree(char *dir) #ifdef __BeOS return -1; #endif -#if defined __sgi || defined __sun__ +#if defined (__sgi) || defined (__sun__) || defined (__sun) || defined(__sparc) || defined(__sparc__) if (statfs(name, &disk, sizeof(struct statfs), 0)){ /* printf("diskfree: Couldn't get information about %s.\n",dir); */ diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h index 6156026b313..a4de48ec053 100644 --- a/source/blender/imbuf/intern/IMB_anim.h +++ b/source/blender/imbuf/intern/IMB_anim.h @@ -101,7 +101,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) || (__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/readimage.c b/source/blender/imbuf/intern/readimage.c index f15d3505374..0f817e22dd1 100644 --- a/source/blender/imbuf/intern/readimage.c +++ b/source/blender/imbuf/intern/readimage.c @@ -65,7 +65,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/src/drawmesh.c b/source/blender/src/drawmesh.c index 741a50ef095..79ac7b8435c 100644 --- a/source/blender/src/drawmesh.c +++ b/source/blender/src/drawmesh.c @@ -83,7 +83,7 @@ /* some local functions */ static void draw_hide_tfaces(Object *ob, Mesh *me); -#if defined(GL_EXT_texture_object) && !defined(__sun__) && !defined(__APPLE__) +#if defined(GL_EXT_texture_object) && (!defined(__sun__) || (!defined(__sun))) && !defined(__APPLE__) /* exception for mesa... not according th opengl specs */ #ifndef __linux__ diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index 0e6be7fe543..9e41a8f44a6 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -238,7 +238,7 @@ static void draw_icon_centered(float *pos, unsigned int *rect, int rectsize) /* use bitmap to shift rasterpos in pixels */ glBitmap(0, 0, 0.0, 0.0, -hsize, -hsize, &dummy); -#ifdef __sun__ +#if defined (__sun__) || defined ( __sun ) || defined (__sparc) || defined (__sparc__) glFinish(); #endif glDrawPixels(rectsize, rectsize, GL_RGBA, GL_UNSIGNED_BYTE, rect); diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c index a0a29c95a44..28c220ca8a4 100644 --- a/source/blender/src/interface.c +++ b/source/blender/src/interface.c @@ -231,7 +231,8 @@ static uiSaveUnder *ui_bgnpupdraw(int startx, int starty, int endx, int endy, in uiSaveUnder *su; short oldwin; - #if defined(__sgi) || defined(__sun) + #if defined(__sgi) || defined(__sun) || defined(__sun__) || defined (__sparc) || defined (__sparc__) + /* this is a dirty patch: gets sometimes the backbuffer */ my_get_frontbuffer_image(0, 0, 1, 1); my_put_frontbuffer_image(); diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c index d62c7c75cef..8bc722f798d 100644 --- a/source/blender/src/toolbox.c +++ b/source/blender/src/toolbox.c @@ -484,7 +484,8 @@ void tbox_setinfo(int x, int y) void bgnpupdraw(int startx, int starty, int endx, int endy) { - #if defined(__sgi) || defined(__sun__) + #if defined(__sgi) || defined(__sun__) || defined( __sun ) || defined (__sparc) || defined (__sparc__) + /* this is a dirty patch: XgetImage gets sometimes the backbuffer */ my_get_frontbuffer_image(0, 0, 1, 1); my_put_frontbuffer_image();