replace WORDS_BIGENDIAN with __BIG_ENDIAN__
authorCampbell Barton <ideasman42@gmail.com>
Mon, 19 Sep 2011 08:11:30 +0000 (08:11 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 19 Sep 2011 08:11:30 +0000 (08:11 +0000)
source/blender/avi/intern/avirgb.c
source/blender/imbuf/intern/md5.c

index 9e40b00..7050aec 100644 (file)
 #include "MEM_guardedalloc.h"
 #include "avirgb.h"
 
-#ifdef __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN
-#endif
-
-
 /* implementation */
 
 void *avi_converter_from_avi_rgb (AviMovie *movie, int stream, unsigned char *buffer, int *size) {
@@ -63,9 +58,9 @@ void *avi_converter_from_avi_rgb (AviMovie *movie, int stream, unsigned char *bu
        if (bits==16) {
                unsigned short *pxl;
                unsigned char *to;
-               #ifdef WORDS_BIGENDIAN
+#ifdef __BIG_ENDIAN__
                unsigned char  *pxla;
-               #endif            
+#endif           
                
                buf = MEM_mallocN (movie->header->Height * movie->header->Width * 3, "fromavirgbbuf");
 
@@ -75,19 +70,19 @@ void *avi_converter_from_avi_rgb (AviMovie *movie, int stream, unsigned char *bu
                while (y--) {
                        pxl= (unsigned short *) (buffer + y * movie->header->Width * 2);
                        
-                       #ifdef WORDS_BIGENDIAN
+#ifdef __BIG_ENDIAN__
                        pxla= (unsigned char *)pxl;
-                       #endif
+#endif
 
                        x= movie->header->Width;
                        while (x--) {
-                               #ifdef WORDS_BIGENDIAN
+#ifdef __BIG_ENDIAN__
                                i= pxla[0];
                                pxla[0]= pxla[1];
                                pxla[1]= i;
        
                                pxla+=2;
-                               #endif
+#endif
                        
                                *(to++)= ((*pxl>>10)&0x1f)*8;
                                *(to++)= ((*pxl>>5)&0x1f)*8;
index 1814814..2192fa3 100644 (file)
 
 #include "md5.h"
 
-#ifdef WORDS_BIGENDIAN
-# define SWAP(n)                                                       \
+#ifdef __BIG_ENDIAN__
+#  define SWAP(n)                                                      \
        (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
 #else
-# define SWAP(n) (n)
+#  define SWAP(n) (n)
 #endif