From 62d7cdfa0a39f6085fa3b2cb84e2ed761bca9f28 Mon Sep 17 00:00:00 2001
From: Juan Jose Garcia Ripoll <jjgarcia@users.sourceforge.net>
Date: Sat, 11 Jun 2011 01:39:37 +0200
Subject: [PATCH] Update list of FFI ABIs in libffi.

---
 src/c/ffi.d | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/c/ffi.d b/src/c/ffi.d
index 90be9466c..974a9c15a 100644
--- a/src/c/ffi.d
+++ b/src/c/ffi.d
@@ -136,15 +136,18 @@ static struct {
         ffi_abi abi;
 } ecl_foreign_cc_table[] = {
         {@':default', FFI_DEFAULT_ABI},
-#ifdef X86_WIN32
+#ifdef X86_ANY
+# ifdef X86_WIN32
 	{@':cdecl', FFI_SYSV},
 	{@':sysv', FFI_SYSV},
         {@':stdcall', FFI_STDCALL}
-#endif
-#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__))
+# else
+#  if !defined(X86_WIN64)
 	{@':cdecl', FFI_SYSV},
 	{@':sysv', FFI_SYSV},
 	{@':unix64', FFI_UNIX64}
+#  endif
+# endif
 #endif
 };