diff options
| author | doko@ubuntu.com <doko@ubuntu.com> | 2014-08-09 21:53:29 (GMT) |
|---|---|---|
| committer | doko@ubuntu.com <doko@ubuntu.com> | 2014-08-09 21:53:29 (GMT) |
| commit | be1cd50eb1c5a7edad7dbba04bc27e2523965a47 (patch) | |
| tree | a801d623f0739689d0889fc7ef2cd652af1dc53e /Modules | |
| parent | 9e15d7a3cc1e02783472a1d62eb86df0837b7ef1 (diff) | |
| parent | 6a66f155dfb759ddbf26195f2f2f68aba09d3a71 (diff) | |
| download | cpython-be1cd50eb1c5a7edad7dbba04bc27e2523965a47.zip cpython-be1cd50eb1c5a7edad7dbba04bc27e2523965a47.tar.gz cpython-be1cd50eb1c5a7edad7dbba04bc27e2523965a47.tar.bz2 | |
merge 3.4.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_ctypes/libffi.diff | 2 | ||||
| -rw-r--r-- | Modules/_ctypes/libffi/fficonfig.py.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_ctypes/libffi.diff b/Modules/_ctypes/libffi.diff index ba8fcdd..9db80d3 100644 --- a/Modules/_ctypes/libffi.diff +++ b/Modules/_ctypes/libffi.diff @@ -124,7 +124,7 @@ diff -urN libffi-3.1/fficonfig.py.in libffi/fficonfig.py.in +ffi_platforms = { + 'MIPS_IRIX': ['src/mips/ffi.c', 'src/mips/o32.S', 'src/mips/n32.S'], + 'MIPS_LINUX': ['src/mips/ffi.c', 'src/mips/o32.S'], -+ 'X86': ['src/x86/ffi.c', 'src/x86/sysv.S'], ++ 'X86': ['src/x86/ffi.c', 'src/x86/sysv.S', 'src/x86/win32.S'], + 'X86_FREEBSD': ['src/x86/ffi.c', 'src/x86/freebsd.S'], + 'X86_WIN32': ['src/x86/ffi.c', 'src/x86/win32.S'], + 'SPARC': ['src/sparc/ffi.c', 'src/sparc/v8.S', 'src/sparc/v9.S'], diff --git a/Modules/_ctypes/libffi/fficonfig.py.in b/Modules/_ctypes/libffi/fficonfig.py.in index 15c349b..d102498 100644 --- a/Modules/_ctypes/libffi/fficonfig.py.in +++ b/Modules/_ctypes/libffi/fficonfig.py.in @@ -6,7 +6,7 @@ src/closures.c ffi_platforms = { 'MIPS_IRIX': ['src/mips/ffi.c', 'src/mips/o32.S', 'src/mips/n32.S'], 'MIPS_LINUX': ['src/mips/ffi.c', 'src/mips/o32.S'], - 'X86': ['src/x86/ffi.c', 'src/x86/sysv.S'], + 'X86': ['src/x86/ffi.c', 'src/x86/sysv.S', 'src/x86/win32.S'], 'X86_FREEBSD': ['src/x86/ffi.c', 'src/x86/freebsd.S'], 'X86_WIN32': ['src/x86/ffi.c', 'src/x86/win32.S'], 'SPARC': ['src/sparc/ffi.c', 'src/sparc/v8.S', 'src/sparc/v9.S'], |