[Python-checkins] r61095 - in python/branches/libffi3-branch/Modules/_ctypes/libffi: fficonfig.py.in src/x86/ffi.c

[thomas.heller]

Author: thomas.heller
Date: Wed Feb 27 11:00:12 2008
New Revision: 61095

Modified:
   python/branches/libffi3-branch/Modules/_ctypes/libffi/fficonfig.py.in
   python/branches/libffi3-branch/Modules/_ctypes/libffi/src/x86/ffi.c
Log:
src/x86/ffi.c: sync with libffi3.
fficonfig.py.in: add fix for OpenBSD.


Modified: python/branches/libffi3-branch/Modules/_ctypes/libffi/fficonfig.py.in
==============================================================================
--- python/branches/libffi3-branch/Modules/_ctypes/libffi/fficonfig.py.in	(original)
+++ python/branches/libffi3-branch/Modules/_ctypes/libffi/fficonfig.py.in	Wed Feb 27 11:00:12 2008
@@ -7,6 +7,7 @@
     'MIPS_LINUX': ['src/mips/ffi.c', 'src/mips/o32.S'],
     'X86': ['src/x86/ffi.c', 'src/x86/sysv.S'],
     'X86_DARWIN': ['src/x86/ffi_darwin.c', 'src/x86/darwin.S'],
+    'X86_FREEBSD': ['src/x86/ffi.c', 'src/x86/sysv.S'],
     'X86_WIN32': ['src/x86/ffi.c', 'src/x86/win32.S'],
     'SPARC': ['src/sparc/ffi.c', 'src/sparc/v8.S', 'src/sparc/v9.S'],
     'ALPHA': ['src/alpha/ffi.c', 'src/alpha/osf.S'],

Modified: python/branches/libffi3-branch/Modules/_ctypes/libffi/src/x86/ffi.c
==============================================================================
--- python/branches/libffi3-branch/Modules/_ctypes/libffi/src/x86/ffi.c	(original)
+++ python/branches/libffi3-branch/Modules/_ctypes/libffi/src/x86/ffi.c	Wed Feb 27 11:00:12 2008
@@ -121,7 +121,7 @@
   switch (cif->rtype->type)
     {
     case FFI_TYPE_VOID:
-#if !defined(X86_WIN32) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
+#ifdef X86
     case FFI_TYPE_STRUCT:
 #endif
 #if defined(X86) || defined(X86_DARWIN)
@@ -142,7 +142,7 @@
       cif->flags = FFI_TYPE_SINT64;
       break;
 
-#if defined(X86_WIN32) || defined(__OpenBSD__) || defined(__FreeBSD__)
+#ifndef X86
     case FFI_TYPE_STRUCT:
       if (cif->rtype->size == 1)
         {