From 22801c4e8b8f877ffdd9afe39ac12308e1f15b84 Mon Sep 17 00:00:00 2001 From: Juan Jose Garcia Ripoll Date: Mon, 1 Aug 2011 15:34:18 +0200 Subject: [PATCH] In ffi.d improve the list of names of valid ABIs by copying the #ifdef chain from libffi.h --- src/c/ffi.d | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/c/ffi.d b/src/c/ffi.d index b50beec7d..445485fe4 100644 --- a/src/c/ffi.d +++ b/src/c/ffi.d @@ -136,12 +136,16 @@ static struct { ffi_abi abi; } ecl_foreign_cc_table[] = { {@':default', FFI_DEFAULT_ABI}, -#if !defined(X86_WIN64) -# if defined(X86) || defined(X86_64) || defined(X86_WIN32) || defined(X86_ANY) +#ifdef X86_WIN32 {@':cdecl', FFI_SYSV}, {@':sysv', FFI_SYSV}, - {@':unix64', FFI_UNIX64} -# endif + {@':stdcall', FFI_STDCALL}, +#elif defined(X86_WIN64) + {@':win64', FFI_WIN64}, +#elsif defined(X86_ANY) || defined(X86) || defined(X86_64) + {@':cdecl', FFI_SYSV}, + {@':sysv', FFI_SYSV}, + {@':unix64', FFI_UNIX64}, #endif };