[Mplayer-cvslog] CVS: main/libfaad2 bits.h,1.1,1.2 common.h,1.1,1.2 config.h,1.1,1.2

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/libfaad2
In directory mail:/var/tmp.root/cvs-serv13271

Modified Files:
	bits.h common.h config.h 
Log Message:
fixed win32 compile problems and broken bigendian support

Index: bits.h
===================================================================
RCS file: /cvsroot/mplayer/main/libfaad2/bits.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bits.h	30 Aug 2003 22:30:21 -0000	1.1
+++ bits.h	2 Sep 2003 20:40:36 -0000	1.2
@@ -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) \

Index: common.h
===================================================================
RCS file: /cvsroot/mplayer/main/libfaad2/common.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- common.h	30 Aug 2003 22:30:21 -0000	1.1
+++ common.h	2 Sep 2003 20:40:36 -0000	1.2
@@ -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;
 
 

Index: config.h
===================================================================
RCS file: /cvsroot/mplayer/main/libfaad2/config.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config.h	30 Aug 2003 22:30:21 -0000	1.1
+++ config.h	2 Sep 2003 20:40:36 -0000	1.2
@@ -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.  */