aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBo Thorsen <bo@smetana.suse.de>2002-10-01 15:38:00 +0000
committerBo Thorsen <bo@gcc.gnu.org>2002-10-01 17:38:00 +0200
commit5d2975841c320fa38b5a14b6d001dd8dbe99e87d (patch)
treebbdfe60f89a4380075f5b2e80fdf8ae4cc3496c7
parentbc9ec51b0bff99ff7651c0bb0ca00330c17cdfe3 (diff)
downloadgcc-5d2975841c320fa38b5a14b6d001dd8dbe99e87d.zip
gcc-5d2975841c320fa38b5a14b6d001dd8dbe99e87d.tar.gz
gcc-5d2975841c320fa38b5a14b6d001dd8dbe99e87d.tar.bz2
* include/ffi.h.in: Fix i386 win32 compilation.
From-SVN: r57691
-rw-r--r--libffi/ChangeLog4
-rw-r--r--libffi/include/ffi.h.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index c2d664d..a41a79f 100644
--- 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 70a7842..4f7667e 100644
--- 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__