From 30a171fcb6ae70a98a6366c401e494ecc44ee2d8 Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Thu, 16 Sep 2010 11:35:07 +0000 Subject: Merged revisions 84535 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ........ r84535 | ronald.oussoren | 2010-09-05 20:25:59 +0200 (Sun, 05 Sep 2010) | 2 lines Fix for issue9662, patch by Łukasz Langa in issue5504. ........ --- Modules/_ctypes/callbacks.c | 4 ++++ Modules/_ctypes/libffi_osx/include/ffi.h | 5 ++++- Modules/_ctypes/malloc_closure.c | 3 +-- setup.py | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c index deedaa3..716a02f 100644 --- a/Modules/_ctypes/callbacks.c +++ b/Modules/_ctypes/callbacks.c @@ -469,9 +469,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 3d39064..c104a5c 100644 --- 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 d0a20b5..b98d43b 100644 --- a/Modules/_ctypes/malloc_closure.c +++ b/Modules/_ctypes/malloc_closure.c @@ -110,7 +110,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 0ed2bae..4f89559 100644 --- a/setup.py +++ b/setup.py @@ -1875,6 +1875,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') -- cgit v0.12