forked from bartvdbraak/blender
Updated the Sun ifdef's basically I standardized them so they
were all the same and make sure all platforms see them. Kent
This commit is contained in:
parent
b5ae8a30a2
commit
9ed4436058
@ -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) )
|
||||
|
@ -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
|
||||
|
@ -49,7 +49,7 @@
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#ifdef __sun__
|
||||
#if defined(__sun__) || defined( __sun ) || defined (__sparc) || defined (__sparc__)
|
||||
#include <strings.h>
|
||||
#endif
|
||||
|
||||
|
@ -50,7 +50,7 @@
|
||||
#include "BLI_winstuff.h"
|
||||
#endif
|
||||
|
||||
#ifdef __sun__
|
||||
#if defined(__sun__) || defined( __sun ) || defined (__sparc) || defined (__sparc__)
|
||||
#include <strings.h>
|
||||
#endif
|
||||
|
||||
|
@ -56,7 +56,7 @@
|
||||
#include <time.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#if defined(__sgi) || defined(__sun__) || defined(__sun)
|
||||
#if defined(__sgi) || defined(__sun__) || defined(__sun) || defined(__sparc) || defined(__sparc__)
|
||||
#include <sys/statfs.h>
|
||||
#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); */
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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__
|
||||
|
@ -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);
|
||||
|
@ -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();
|
||||
|
@ -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();
|
||||
|
Loading…
Reference in New Issue
Block a user