Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29443 b3059339-0415-0410-9bf9-f77b7e298cf2

35 files changed, 54 insertions, 45 deletions

diff --git a/DOCS/tech/colorspaces.txt b/DOCS/tech/colorspaces.txt
index dc00fd388d..291a435f30 100644
--- a/DOCS/tech/colorspaces.txt
+++ b/DOCS/tech/colorspaces.txt
@@ -154,5 +154,5 @@ order followed by the number 32, the portable way to access it is to load
 the pixel into an integer and use bitmasks.
 
 When the above portable access methods are not used, you will need to write
-2 versions of your code, and use #ifdef WORDS_BIGENDIAN to choose the correct
+2 versions of your code, and use #if HAVE_BIGENDIAN to choose the correct
 one.
diff --git a/gui/bitmap.c b/gui/bitmap.c
index 6cf7d35d60..148998865a 100644
--- a/gui/bitmap.c
+++ b/gui/bitmap.c
@@ -108,7 +108,7 @@ static int conv24to32( txSample * bf )
 static void Normalize( txSample * bf )
 {
  int           i;
-#ifndef WORDS_BIGENDIAN
+#if !HAVE_BIGENDIAN
  for ( i=0;i < (int)bf->ImageSize;i+=4 ) bf->Image[i+3]=0;
 #else
  for ( i=0;i < (int)bf->ImageSize;i+=4 ) bf->Image[i]=0;
diff --git a/gui/wm/ws.c b/gui/wm/ws.c
index 27749be53b..8133baab09 100644
--- a/gui/wm/ws.c
+++ b/gui/wm/ws.c
@@ -1082,7 +1082,7 @@ int wsGetDepthOnScreen( void )
    wsRedMask=mXImage->red_mask;
    wsGreenMask=mXImage->green_mask;
    wsBlueMask=mXImage->blue_mask;
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
    wsNonNativeOrder = mXImage->byte_order == LSBFirst;
 #else
    wsNonNativeOrder = mXImage->byte_order == MSBFirst;
diff --git a/liba52/bitstream.h b/liba52/bitstream.h
index e894f16781..76f5556ea9 100644
--- a/liba52/bitstream.h
+++ b/liba52/bitstream.h
@@ -62,7 +62,7 @@ static inline uint32_t unaligned32(const void *v) {
 #endif
 
 /* (stolen from the kernel) */
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
 
 #	define swab32(x) (x)
 
diff --git a/liba52/liba52_changes.diff b/liba52/liba52_changes.diff
index 1b3574f043..e44b84a84d 100644
--- a/liba52/liba52_changes.diff
+++ b/liba52/liba52_changes.diff
@@ -116,7 +116,7 @@
 +#endif
 +
  /* (stolen from the kernel) */
- #ifdef WORDS_BIGENDIAN
+ #if HAVE_BIGENDIAN
 
 @@ -28,7 +68,7 @@
 
diff --git a/libaf/af_format.c b/libaf/af_format.c
index faeae02efc..64acbbb9b6 100644
--- a/libaf/af_format.c
+++ b/libaf/af_format.c
@@ -332,7 +332,7 @@ af_info_t af_info_format = {
 };
 
 static inline uint32_t load24bit(void* data, int pos) {
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
   return (((uint32_t)((uint8_t*)data)[3*pos])<<24) |
 	 (((uint32_t)((uint8_t*)data)[3*pos+1])<<16) |
 	 (((uint32_t)((uint8_t*)data)[3*pos+2])<<8);
@@ -344,7 +344,7 @@ static inline uint32_t load24bit(void* data, int pos) {
 }
 
 static inline void store24bit(void* data, int pos, uint32_t expanded_value) {
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
       ((uint8_t*)data)[3*pos]=expanded_value>>24;
       ((uint8_t*)data)[3*pos+1]=expanded_value>>16;
       ((uint8_t*)data)[3*pos+2]=expanded_value>>8;
diff --git a/libaf/af_format.h b/libaf/af_format.h
index 553d18d962..66a74c901e 100644
--- a/libaf/af_format.h
+++ b/libaf/af_format.h
@@ -30,7 +30,7 @@
 #define AF_FORMAT_LE		(1<<0) // Little Endian
 #define AF_FORMAT_END_MASK	(1<<0)
 
-#ifdef WORDS_BIGENDIAN	       	// Native endian of cpu
+#if HAVE_BIGENDIAN	       	// Native endian of cpu
 #define	AF_FORMAT_NE		AF_FORMAT_BE
 #else
 #define	AF_FORMAT_NE		AF_FORMAT_LE
@@ -83,7 +83,7 @@
 #define AF_FORMAT_FLOAT_LE	(AF_FORMAT_F|AF_FORMAT_32BIT|AF_FORMAT_LE)
 #define AF_FORMAT_FLOAT_BE	(AF_FORMAT_F|AF_FORMAT_32BIT|AF_FORMAT_BE)
 
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
 #define AF_FORMAT_U16_NE AF_FORMAT_U16_BE
 #define AF_FORMAT_S16_NE AF_FORMAT_S16_BE
 #define AF_FORMAT_U24_NE AF_FORMAT_U24_BE
diff --git a/libaf/af_lavcac3enc.c b/libaf/af_lavcac3enc.c
index 36a19dad60..f89302f4a6 100644
--- a/libaf/af_lavcac3enc.c
+++ b/libaf/af_lavcac3enc.c
@@ -238,7 +238,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data)
             int16_t *out = (int16_t *)buf;
             int bsmod = dest[5] & 0x7;
 
-#ifndef WORDS_BIGENDIAN
+#if !HAVE_BIGENDIAN
             int i;
             char tmp;
             for (i = 0; i < len; i += 2) {
diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c
index 3bb10eddd0..cc80b0ded3 100644
--- a/libao2/ao_alsa.c
+++ b/libao2/ao_alsa.c
@@ -368,13 +368,13 @@ static int init(int rate_hz, int channels, int format, int flags)
       case AF_FORMAT_U16_BE:
 	alsa_format = SND_PCM_FORMAT_U16_BE;
 	break;
-#ifndef WORDS_BIGENDIAN
+#if !HAVE_BIGENDIAN
       case AF_FORMAT_AC3:
 #endif
       case AF_FORMAT_S16_LE:
 	alsa_format = SND_PCM_FORMAT_S16_LE;
 	break;
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
       case AF_FORMAT_AC3:
 #endif
       case AF_FORMAT_S16_BE:
diff --git a/libao2/ao_alsa5.c b/libao2/ao_alsa5.c
index feb2919f1d..96c951a92a 100644
--- a/libao2/ao_alsa5.c
+++ b/libao2/ao_alsa5.c
@@ -101,13 +101,13 @@ static int init(int rate_hz, int channels, int format, int flags)
 	case AF_FORMAT_U16_BE:
 	    alsa_format.format = SND_PCM_SFMT_U16_BE;
 	    break;
-#ifndef WORDS_BIGENDIAN
+#if !HAVE_BIGENDIAN
 	case AF_FORMAT_AC3:
 #endif
 	case AF_FORMAT_S16_LE:
 	    alsa_format.format = SND_PCM_SFMT_S16_LE;
 	    break;
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
 	case AF_FORMAT_AC3:
 #endif
 	case AF_FORMAT_S16_BE:
diff --git a/libao2/ao_coreaudio.c b/libao2/ao_coreaudio.c
index 76cb9174be..ad17773fbd 100644
--- a/libao2/ao_coreaudio.c
+++ b/libao2/ao_coreaudio.c
@@ -345,7 +345,7 @@ int b_alive;
     }
     if ((format & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_AC3) {
         // Currently ac3 input (comes from hwac3) is always in native byte-order.
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
         inDesc.mFormatFlags |= kAudioFormatFlagIsBigEndian;
 #endif
     }
@@ -669,7 +669,7 @@ static int OpenSPDIF(void)
 
     /* FIXME: If output stream is not native byte-order, we need change endian somewhere. */
     /*        Although there's no such case reported.                                     */
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
     if (!(ao->stream_format.mFormatFlags & kAudioFormatFlagIsBigEndian))
 #else
     if (ao->stream_format.mFormatFlags & kAudioFormatFlagIsBigEndian)
diff --git a/libao2/ao_dxr2.c b/libao2/ao_dxr2.c
index 136efd1a9e..1a0a3e6135 100644
--- a/libao2/ao_dxr2.c
+++ b/libao2/ao_dxr2.c
@@ -207,7 +207,7 @@ static int play(void* data,int len,int flags){
 	int i;
 	//unsigned short *s=data;
 	uint16_t *s=data;
-#ifndef WORDS_BIGENDIAN
+#if !HAVE_BIGENDIAN
 	for(i=0;i<len/2;i++) s[i] = bswap_16(s[i]);
 #endif
 	dxr2_send_lpcm_packet(data,len,0xA0,ao_data.pts-10000,freq_id);
diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c
index a28d5d9ad6..acfb6db48a 100644
--- a/libao2/ao_oss.c
+++ b/libao2/ao_oss.c
@@ -306,7 +306,7 @@ ac3_retry:
   ao_data.format=format;
   oss_format=format2oss(format);
   if (oss_format == -1) {
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
     oss_format=AFMT_S16_BE;
 #else
     oss_format=AFMT_S16_LE;
diff --git a/libao2/ao_pcm.c b/libao2/ao_pcm.c
index a49a963a30..7f7a6e3b27 100644
--- a/libao2/ao_pcm.c
+++ b/libao2/ao_pcm.c
@@ -234,7 +234,7 @@ static int play(void* data,int len,int flags){
 
 // let libaf to do the conversion...
 #if 0
-//#ifdef WORDS_BIGENDIAN
+//#if HAVE_BIGENDIAN
     if (ao_data.format == AFMT_S16_LE) {
       unsigned short *buffer = (unsigned short *) data;
       register int i;
diff --git a/libfaad2/common.h b/libfaad2/common.h
index 576e9ca115..59df8c0a5d 100644
--- a/libfaad2/common.h
+++ b/libfaad2/common.h
@@ -245,7 +245,7 @@ char *strchr(), *strrchr();
 
 #endif
 
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
 #define ARCH_IS_BIG_ENDIAN
 #endif
 
diff --git a/libfaad2/local_changes.diff b/libfaad2/local_changes.diff
index 11610c6e8a..6225df3f0e 100644
--- a/libfaad2/local_changes.diff
+++ b/libfaad2/local_changes.diff
@@ -62,6 +62,15 @@
 +
  typedef float float32_t;
 
+@@ -245,7 +245,7 @@
+ 
+ #endif
+ 
+-#ifdef WORDS_BIGENDIAN
++#if HAVE_BIGENDIAN
+ #define ARCH_IS_BIG_ENDIAN
+ #endif
+ 
 @@ -289,7 +305,7 @@
    }
 
diff --git a/libmpcodecs/ad_hwac3.c b/libmpcodecs/ad_hwac3.c
index 19a77baca6..f59fa9c15b 100644
--- a/libmpcodecs/ad_hwac3.c
+++ b/libmpcodecs/ad_hwac3.c
@@ -180,7 +180,7 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m
     buf16[2] = 0x0001;   // data-type ac3
     buf16[2] |= (sh_audio->a_in_buffer[5] & 0x7) << 8; // bsmod
     buf16[3] = len << 3; // number of bits in payload
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
     memcpy(buf + 8, sh_audio->a_in_buffer, len);
 #else
     swab(sh_audio->a_in_buffer, buf + 8, len);
@@ -524,7 +524,7 @@ static int decode_audio_dts(unsigned char *indata_ptr, int len, unsigned char *b
   buf16[3] = fsize << 3;
 
   if (!convert_16bits) {
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
   /* BE stream */
   if (indata_ptr[0] == 0x1f || indata_ptr[0] == 0x7f)
 #else
diff --git a/libmpcodecs/img_format.h b/libmpcodecs/img_format.h
index 3922fdc5f3..559501fb89 100644
--- a/libmpcodecs/img_format.h
+++ b/libmpcodecs/img_format.h
@@ -25,7 +25,7 @@
 #define IMGFMT_BGR24 (IMGFMT_BGR|24)
 #define IMGFMT_BGR32 (IMGFMT_BGR|32)
 
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
 #define IMGFMT_ABGR IMGFMT_RGB32
 #define IMGFMT_BGRA (IMGFMT_RGB32|64)
 #define IMGFMT_ARGB IMGFMT_BGR32
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index 244e6495b3..68e7c3aa17 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -896,7 +896,7 @@ static mp_image_t *decode(sh_video_t *sh, void *data, int len, int flags){
         mpi->stride[2]*=2;
     }
 
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
     // FIXME: this might cause problems for buffers with FF_BUFFER_HINTS_PRESERVE
     if (mpi->bpp == 8)
         swap_palette(mpi->planes[1]);
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index 08d0b130c1..6192ffda20 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -233,7 +233,7 @@ void vf_mpi_clear(mp_image_t* mpi,int x0,int y0,int w,int h){
 	    unsigned int* p=(unsigned int*) dst;
 	    int size=(mpi->bpp>>3)*w/4;
 	    int i;
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
 #define CLEAR_PACKEDYUV_PATTERN 0x00800080
 #define CLEAR_PACKEDYUV_PATTERN_SWAPPED 0x80008000
 #else
diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c
index 6c741cfad9..ccd0c1c96e 100644
--- a/libmpcodecs/vf_scale.c
+++ b/libmpcodecs/vf_scale.c
@@ -322,7 +322,7 @@ static void start_slice(struct vf_instance_s* vf, mp_image_t *mpi){
 static void scale(struct SwsContext *sws1, struct SwsContext *sws2, uint8_t *src[MP_MAX_PLANES], int src_stride[MP_MAX_PLANES],
                   int y, int h,  uint8_t *dst[MP_MAX_PLANES], int dst_stride[MP_MAX_PLANES], int interlaced){
     uint8_t *src2[MP_MAX_PLANES]={src[0], src[1], src[2]};
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
     uint32_t pal2[256];
     if (src[1] && !src[2]){
         int i;
diff --git a/libmpdemux/asf.h b/libmpdemux/asf.h
index b8cd4374ff..a1e29a942f 100644
--- a/libmpdemux/asf.h
+++ b/libmpdemux/asf.h
@@ -19,7 +19,7 @@
 #ifndef MPLAYER_ASF_H
 #define MPLAYER_ASF_H
 
-//#include "config.h"	/* for WORDS_BIGENDIAN */
+//#include "config.h"	/* for HAVE_BIGENDIAN */
 #include <inttypes.h>
 #include "libavutil/common.h"
 #include "mpbswap.h"
@@ -105,7 +105,7 @@ typedef struct __attribute__((packed)) {
 } ASF_stream_chunck_t;
 
 // Definition of the stream type
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
 	#define ASF_STREAMING_CLEAR	0x2443		// $C
 	#define ASF_STREAMING_DATA	0x2444		// $D
 	#define ASF_STREAMING_END_TRANS	0x2445		// $E
@@ -140,7 +140,7 @@ typedef struct {
  * Some macros to swap little endian structures read from an ASF file
  * into machine endian format
  */
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
 #define	le2me_ASF_obj_header_t(h) {					\
     (h)->size = le2me_64((h)->size);					\
 }
diff --git a/libmpdemux/aviheader.h b/libmpdemux/aviheader.h
index 0dd915fc5d..a06ef711ac 100644
--- a/libmpdemux/aviheader.h
+++ b/libmpdemux/aviheader.h
@@ -21,7 +21,7 @@
 
 #include <sys/types.h>
 #include <stdint.h>
-#include "config.h"	/* get correct definition of WORDS_BIGENDIAN */
+#include "config.h"	/* get correct definition of HAVE_BIGENDIAN */
 #include "libavutil/common.h"
 #include "mpbswap.h"
 
@@ -227,7 +227,7 @@ typedef enum {
  * Some macros to swap little endian structures read from an AVI file
  * into machine endian format
  */
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
 #define	le2me_MainAVIHeader(h) {					\
     (h)->dwMicroSecPerFrame = le2me_32((h)->dwMicroSecPerFrame);	\
     (h)->dwMaxBytesPerSec = le2me_32((h)->dwMaxBytesPerSec);		\
diff --git a/libmpdemux/demux_xmms.c b/libmpdemux/demux_xmms.c
index 9263621a0b..8edbc2fe28 100644
--- a/libmpdemux/demux_xmms.c
+++ b/libmpdemux/demux_xmms.c
@@ -101,7 +101,7 @@ static int disk_open(AFormat fmt, int rate, int nch) {
             xmms_afmt=AF_FORMAT_U16_LE;
             break;
         case FMT_U16_NE:
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
             xmms_afmt=AF_FORMAT_U16_BE;
 #else
             xmms_afmt=AF_FORMAT_U16_LE;
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index 8035fd24e8..77b20e1bcf 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -384,7 +384,7 @@ stream_t* new_ds_stream(demux_stream_t *ds);
 static inline int avi_stream_id(unsigned int id){
   unsigned char *p=(unsigned char *)&id;
   unsigned char a,b;
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
   a=p[3]-'0'; b=p[2]-'0';
 #else
   a=p[0]-'0'; b=p[1]-'0';
diff --git a/libmpdemux/ms_hdr.h b/libmpdemux/ms_hdr.h
index 87d0bf6e58..aaeffa6ef3 100644
--- a/libmpdemux/ms_hdr.h
+++ b/libmpdemux/ms_hdr.h
@@ -68,7 +68,7 @@ typedef struct {
 #endif
 
 #ifndef le2me_BITMAPINFOHEADER
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
 #define le2me_BITMAPINFOHEADER(h) {					\
     (h)->biSize = le2me_32((h)->biSize);				\
     (h)->biWidth = le2me_32((h)->biWidth);				\
diff --git a/libvo/osd_template.c b/libvo/osd_template.c
index e59b4e5681..6d8305a3c5 100644
--- a/libvo/osd_template.c
+++ b/libvo/osd_template.c
@@ -320,7 +320,7 @@ static inline void RENAME(vo_draw_alpha_rgb24)(int w,int h, unsigned char* src,
 
 static inline void RENAME(vo_draw_alpha_rgb32)(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride){
     int y;
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
     dstbase++;
 #endif
 #if HAVE_MMX
diff --git a/libvo/vo_svga.c b/libvo/vo_svga.c
index 2dcaf6401f..606d02c7d3 100644
--- a/libvo/vo_svga.c
+++ b/libvo/vo_svga.c
@@ -660,7 +660,7 @@ static int query_format(uint32_t format) {
     if( (!IMGFMT_IS_RGB(format)) && (!IMGFMT_IS_BGR(format)) ) return 0;
 
 // Reject different endian
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
     if (IMGFMT_IS_BGR(format)) return 0;
 #else
     if (IMGFMT_IS_RGB(format)) return 0;
diff --git a/libvo/vo_tga.c b/libvo/vo_tga.c
index 0b338f994c..dad6b960a9 100644
--- a/libvo/vo_tga.c
+++ b/libvo/vo_tga.c
@@ -138,7 +138,7 @@ static int write_tga( char *file, int bpp, int dx, int dy, uint8_t *buf, int str
                     s = buf;
                     d = line_buff;
                     for(x = 0; x < dx; x++) {
-                    #ifdef WORDS_BIGENDIAN
+                    #if HAVE_BIGENDIAN
                         d[0] = s[3];
                         d[1] = s[2];
                         d[2] = s[1];
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index 1d5b2b55a0..05762e5bbe 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -267,7 +267,7 @@ static void freeMyXImage(void)
     ImageData = NULL;
 }
 
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
 #define BO_NATIVE    MSBFirst
 #define BO_NONNATIVE LSBFirst
 #else
@@ -457,7 +457,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
     // we can easily "emulate" them.
     if (out_format & 64 && (IMGFMT_IS_RGB(out_format) || IMGFMT_IS_BGR(out_format))) {
       out_format &= ~64;
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
       out_offset = 1;
 #else
       out_offset = -1;
diff --git a/mp3lib/decod386.c b/mp3lib/decod386.c
index 4b6d69bc4d..a2cfb56ce8 100644
--- a/mp3lib/decod386.c
+++ b/mp3lib/decod386.c
@@ -50,11 +50,11 @@
  * On a SPARC cpu, we fetch the low-order 32-bit from the second 32-bit
  * word of the double fp value stored in memory.  On an x86 cpu, we fetch it
  * from the first 32-bit word.
- * I'm not sure if the WORDS_BIGENDIAN feature test covers all possible memory
+ * I'm not sure if the HAVE_BIGENDIAN feature test covers all possible memory
  * layouts of double floating point values an all cpu architectures.  If
  * it doesn't work for you, just enable the "old WRITE_SAMPLE" macro.
  */
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
 #define	MANTISSA_OFFSET	1
 #else
 #define	MANTISSA_OFFSET	0
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c
index 2403e85cd4..12063e53d8 100644
--- a/stream/stream_cdda.c
+++ b/stream/stream_cdda.c
@@ -346,7 +346,7 @@ static int fill_buffer(stream_t* s, char* buffer, int max_len) {
   if (!buf)
     return 0;
 
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
   for(i=0;i<CD_FRAMESIZE_RAW/2;i++)
           buf[i]=le2me_16(buf[i]);
 #endif
diff --git a/tremor/misc.h b/tremor/misc.h
index cb9b66a678..8a235d657b 100644
--- a/tremor/misc.h
+++ b/tremor/misc.h
@@ -31,7 +31,7 @@
 #include <sys/types.h>
 #include "config.h"
 
-#ifndef WORDS_BIGENDIAN
+#if !HAVE_BIGENDIAN
 union magic {
   struct {
     ogg_int32_t lo;
diff --git a/tremor/tremor.diff b/tremor/tremor.diff
index 09838bc250..61e31c751a 100644
--- a/tremor/tremor.diff
+++ b/tremor/tremor.diff
@@ -7,7 +7,7 @@
 +#include "config.h"
 
 -#if BYTE_ORDER==LITTLE_ENDIAN
-+#ifndef WORDS_BIGENDIAN
++#if !HAVE_BIGENDIAN
  union magic {
    struct {
      ogg_int32_t lo;
diff --git a/vidix/radeon_vid.c b/vidix/radeon_vid.c
index 7a9d9d086d..ee8aa23109 100644
--- a/vidix/radeon_vid.c
+++ b/vidix/radeon_vid.c
@@ -831,7 +831,7 @@ static void radeon_engine_restore( void )
 				  (pitch64 << 22));
 
     radeon_fifo_wait(1);
-#if defined(WORDS_BIGENDIAN)
+#if HAVE_BIGENDIAN
     OUTREGP(DP_DATATYPE,
 	    HOST_BIG_ENDIAN_EN, ~HOST_BIG_ENDIAN_EN);
 #else