forked from bartvdbraak/blender
Fixed defined __sparc to also check for __sparc__ (thanks to Ferris)
This commit is contained in:
parent
91f956dfe2
commit
d063311b08
@ -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) {
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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) )
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user