Mercurial > mplayer.hg
changeset 10805:125a35fc47a5
fixed win32 compile problems and broken bigendian support
| author | alex |
|---|---|
| date | Tue, 02 Sep 2003 20:40:36 +0000 |
| parents | 281a1b682ee0 |
| children | 3ac138da8d47 |
| files | libfaad2/bits.h libfaad2/common.h libfaad2/config.h |
| diffstat | 3 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libfaad2/bits.h Tue Sep 02 20:23:55 2003 +0000 +++ b/libfaad2/bits.h Tue Sep 02 20:40:36 2003 +0000 @@ -56,9 +56,9 @@ } bitfile; -#if defined (_WIN32) && !defined(_WIN32_WCE) +#if defined (_WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__) #define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax -#elif defined(LINUX) || defined(DJGPP) +#elif defined(ARCH_X86) && (defined(DJGPP) || defined(__GNUC__)) #define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) ) #else #define BSWAP(a) \
--- a/libfaad2/common.h Tue Sep 02 20:23:55 2003 +0000 +++ b/libfaad2/common.h Tue Sep 02 20:40:36 2003 +0000 @@ -109,7 +109,7 @@ #if defined(_WIN32) - +#if 0 typedef unsigned __int64 uint64_t; typedef unsigned __int32 uint32_t; typedef unsigned __int16 uint16_t; @@ -118,6 +118,9 @@ typedef __int32 int32_t; typedef __int16 int16_t; typedef __int8 int8_t; +#else +#include <inttypes.h> +#endif typedef float float32_t;
--- a/libfaad2/config.h Tue Sep 02 20:23:55 2003 +0000 +++ b/libfaad2/config.h Tue Sep 02 20:40:36 2003 +0000 @@ -1,3 +1,9 @@ +#include "../config.h" + +#ifdef WORDS_BIGENDIAN +#define ARCH_IS_BIG_ENDIAN 1 +#endif + /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */