Fix for MinGW cross compiling.

ChangeLog

@@ -4,6 +4,10 @@
     Fix decoding of last block so that the decode length is not a multiple of
     the block length. Fixes github issue #4 reported by Charles Van Winkle.
 
+    * src/sfconfig.h src/sfendian.h
+    Fix for MinGW cross compiling. Use '#if (defined __*66__)' instead of
+    '#if __*86__' because the MinGW header use '#ifdef __x86_64__'.
+
 2012-02-10  Erik de Castro Lopo  <erikd AT mega-nerd DOT com>
 
     * src/ALAC/ src/alac.c

src/sfconfig.h

@@ -113,31 +113,8 @@
 #define HAVE_X86INTRIN_H 0
 #endif
 
-/*
-**  These are are defined by GNU GCC to 1 for the relevant processors and left
-** undefined for other processors. We want to default them to zero when they
-** aren't defined.
-*/
-
-#ifndef __i386__
-#define __i386__ 0
-#endif
-
-#ifndef __i486__
-#define __i486__ 0
-#endif
-
-#ifndef __i586__
-#define __i586__ 0
-#endif
-
-#ifndef __i686__
-#define __i686__ 0
-#endif
-
-#ifndef __x86_64__
-#define __x86_64__ 0
-#endif
+#define CPU_IS_X86		(defined __i486__ || defined __i586__ || defined __i686__ || defined __x86_64__)
+#define CPU_IS_X86_64	(defined __x86_64__)
 
 #endif
 

src/sfendian.h

@@ -25,7 +25,7 @@
 #include <inttypes.h>
 
 
-#if COMPILER_IS_GCC && (__i486__ || __i586__ || __i686__ || __x86_64__)
+#if COMPILER_IS_GCC && CPU_IS_X86
 
 static inline int16_t
 ENDSWAP_16 (int16_t x)
@@ -41,7 +41,7 @@ ENDSWAP_32 (int32_t x)
 	return y ;
 } /* ENDSWAP_32 */
 
-#if __x86_64__
+#if CPU_IS_X86_64
 
 static inline int64_t
 ENDSWAP_64X (int64_t x)