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.

diff --git a/ChangeLog b/ChangeLog
index 5850829..627844c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2014-03-16  Josh Triplett <josh@joshtriplett.org>
 
+       * 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.
+
+2014-03-16  Josh Triplett <josh@joshtriplett.org>
+
        * testsuite/libffi.call/closure_stdcall.c,
        testsuite/libffi.call/closure_thiscall.c: Remove fragile stack pointer
        checks.  These files included inline assembly to save the stack

diff --git a/src/prep_cif.c b/src/prep_cif.c
index e216ef0..55ceed8 100644 (file)
--- 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;