* include/ffi.h.in: Fix i386 win32 compilation.

From-SVN: r57691

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index c2d664d3f8452e1def174a9ecc2d11c2fc434bc3..a41a79f5342f647c7f1afe6ab501da7aa9463690 100644 (file)
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-01  Bo Thorsen  <bo@smetana.suse.de>
+
+       * include/ffi.h.in: Fix i386 win32 compilation.
+
 2002-09-30  Ulrich Weigand  <uweigand@de.ibm.com>
 
        * configure.in: Add s390x-*-linux-* target.

diff --git a/libffi/include/ffi.h.in b/libffi/include/ffi.h.in
index 70a784226b180bca7b431ff3de7eab4e96f124f8..4f7667e6d4d149eb768bb9c3a9024d056c52019f 100644 (file)
--- a/libffi/include/ffi.h.in
+++ b/libffi/include/ffi.h.in
@@ -202,7 +202,7 @@ typedef enum ffi_abi {
 #endif
 
   /* ---- Intel x86 and AMD x86-64 - */
-#if defined(__i386__) || defined(__x86_64__)
+#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__))
   FFI_SYSV,
   FFI_UNIX64,   /* Unix variants all use the same ABI for x86-64  */
 #ifdef __i386__