summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2014-03-16 01:50:02 -0700
committerJosh Triplett <josh@joshtriplett.org>2014-03-16 04:56:57 -0700
commit9531d05f64c2a674e0197158ffad68d69f177bd0 (patch)
treef232d34473348b17bba603051939cb26420a3f7a /src
parent98b52960485a261399f081915f36063de3854a5f (diff)
downloadlibffi-9531d05f64c2a674e0197158ffad68d69f177bd0.tar.gz
prep_cif.c: Remove unnecessary ifdef for X86_WIN32
ffi_prep_cif_core had a special case for X86_WIN32, checking for FFI_THISCALL in addition to the FFI_FIRST_ABI-to-FFI_LAST_ABI range before returning FFI_BAD_ABI. However, on X86_WIN32, FFI_THISCALL already falls in that range, making the special case unnecessary. Remove it.
Diffstat (limited to 'src')
-rw-r--r--src/prep_cif.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/prep_cif.c b/src/prep_cif.c
index e216ef0..55ceed8 100644
--- a/src/prep_cif.c
+++ b/src/prep_cif.c
@@ -118,13 +118,8 @@ ffi_status FFI_HIDDEN ffi_prep_cif_core(ffi_cif *cif, ffi_abi abi,
FFI_ASSERT((!isvariadic) || (nfixedargs >= 1));
FFI_ASSERT(nfixedargs <= ntotalargs);
-#ifndef X86_WIN32
if (! (abi > FFI_FIRST_ABI && abi < FFI_LAST_ABI))
return FFI_BAD_ABI;
-#else
- if (! (abi > FFI_FIRST_ABI && abi < FFI_LAST_ABI || abi == FFI_THISCALL))
- return FFI_BAD_ABI;
-#endif
cif->abi = abi;
cif->arg_types = atypes;