From 0c3d542dc75343725f23a855ee9f59f3aa1dcc74 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 26 Jan 2009 09:56:27 +0000 Subject: [PATCH] WORDS_BIGENDIAN is defined/undefined, not 0/1. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28374 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libaf/af_format.c | 4 ++-- libaf/af_format.h | 2 +- libmpdemux/demux_xmms.c | 2 +- libmpdemux/demuxer.h | 2 +- mp3lib/decod386.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libaf/af_format.c b/libaf/af_format.c index 264198f4f1..df4dac2841 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) { -#if WORDS_BIGENDIAN +#ifdef WORDS_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) { -#if WORDS_BIGENDIAN +#ifdef WORDS_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 49a25374ae..553d18d962 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) -#if WORDS_BIGENDIAN // Native endian of cpu +#ifdef WORDS_BIGENDIAN // Native endian of cpu #define AF_FORMAT_NE AF_FORMAT_BE #else #define AF_FORMAT_NE AF_FORMAT_LE diff --git a/libmpdemux/demux_xmms.c b/libmpdemux/demux_xmms.c index b7b2e72d66..9263621a0b 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: -#if WORDS_BIGENDIAN +#ifdef WORDS_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 6d986fcffd..d794533dad 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -367,7 +367,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; -#if WORDS_BIGENDIAN +#ifdef WORDS_BIGENDIAN a=p[3]-'0'; b=p[2]-'0'; #else a=p[0]-'0'; b=p[1]-'0'; diff --git a/mp3lib/decod386.c b/mp3lib/decod386.c index 50485cdc20..841cf6981d 100644 --- a/mp3lib/decod386.c +++ b/mp3lib/decod386.c @@ -54,7 +54,7 @@ * layouts of double floating point values an all cpu architectures. If * it doesn't work for you, just enable the "old WRITE_SAMPLE" macro. */ -#if WORDS_BIGENDIAN +#ifdef WORDS_BIGENDIAN #define MANTISSA_OFFSET 1 #else #define MANTISSA_OFFSET 0