Fix for issue9662, patch by Łukasz Langa in issue5504.

diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c
index 8e137a0408df371e7563e194249299d7ce4eb9ea..88dad956dc853e4a87fcc7261d6afd05633fbd20 100644 (file)
--- a/Modules/_ctypes/callbacks.c
+++ b/Modules/_ctypes/callbacks.c
@@ -416,9 +416,13 @@ CThunkObject *_ctypes_alloc_callback(PyObject *callable,
                      "ffi_prep_cif failed with %d", result);
         goto error;
     }
+#if defined(X86_DARWIN) || defined(POWERPC_DARWIN)
+    result = ffi_prep_closure(p->pcl_write, &p->cif, closure_fcn, p);
+#else
     result = ffi_prep_closure_loc(p->pcl_write, &p->cif, closure_fcn,
                                  p,
                                  p->pcl_exec);
+#endif
     if (result != FFI_OK) {
         PyErr_Format(PyExc_RuntimeError,
                      "ffi_prep_closure failed with %d", result);

diff --git a/Modules/_ctypes/libffi_osx/include/ffi.h b/Modules/_ctypes/libffi_osx/include/ffi.h
index 3d39064350e9d4dc918a7f99cdf6a72dfe5684c1..c104a5c89350b657df7703f8a70c062a31d64561 100644 (file)
--- a/Modules/_ctypes/libffi_osx/include/ffi.h
+++ b/Modules/_ctypes/libffi_osx/include/ffi.h
@@ -264,6 +264,9 @@ ffi_prep_closure(
        void                    (*fun)(ffi_cif*,void*,void**,void*),
        void*                   user_data);
 
+void ffi_closure_free(void *);
+void *ffi_closure_alloc (size_t size, void **code);
+
 typedef struct ffi_raw_closure {
        char            tramp[FFI_TRAMPOLINE_SIZE];
        ffi_cif*        cif;
@@ -349,4 +352,4 @@ ffi_call(
 }
 #endif
 
-#endif // #ifndef LIBFFI_H
\ No newline at end of file
+#endif // #ifndef LIBFFI_H

diff --git a/Modules/_ctypes/malloc_closure.c b/Modules/_ctypes/malloc_closure.c
index 519941b692da93d9ddaf4c1d59ba593d766cf92c..248c6a67022bae0cabef82e619c767ba5850a383 100644 (file)
--- a/Modules/_ctypes/malloc_closure.c
+++ b/Modules/_ctypes/malloc_closure.c
@@ -106,7 +106,6 @@ void *ffi_closure_alloc(size_t ignored, void** codeloc)
         return NULL;
     item = free_list;
     free_list = item->next;
-       *codeloc = (void *)item;
+    *codeloc = (void *)item;
     return (void *)item;
 }
-

diff --git a/setup.py b/setup.py
index 542b928a4db52968b73b0d52456dbaa0fa897218..2b5d4cbe06f9d9fb4576f43b5ffd8d3be9718ea5 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1657,6 +1657,7 @@ class PyBuildExt(build_ext):
         depends = ['_ctypes/ctypes.h']
 
         if sys.platform == 'darwin':
+            sources.append('_ctypes/malloc_closure.c')
             sources.append('_ctypes/darwin/dlfcn_simple.c')
             extra_compile_args.append('-DMACOSX')
             include_dirs.append('_ctypes/darwin')