[pypy-commit] pypy default: import cffi/0ecb431b2b94

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r88308:c6501a0ed0d6
Date: 2016-11-11 08:20 +0100
http://bitbucket.org/pypy/pypy/changeset/c6501a0ed0d6/

Log:	import cffi/0ecb431b2b94

diff --git a/lib_pypy/cffi/_embedding.h b/lib_pypy/cffi/_embedding.h
--- a/lib_pypy/cffi/_embedding.h
+++ b/lib_pypy/cffi/_embedding.h
@@ -358,7 +358,7 @@
 
 /**********  PyPy-specific section  **********/
 
-void _CFFI_PYTHON_STARTUP_FUNC(const void *[]);   /* forward */
+PyMODINIT_FUNC _CFFI_PYTHON_STARTUP_FUNC(const void *[]);   /* forward */
 
 static struct _cffi_pypy_init_s {
     const char *name;
@@ -366,7 +366,7 @@
     const char *code;
 } _cffi_pypy_init = {
     _CFFI_MODULE_NAME,
-    _CFFI_PYTHON_STARTUP_FUNC,
+    (void(*)(const void *[]))_CFFI_PYTHON_STARTUP_FUNC,
     _CFFI_PYTHON_STARTUP_CODE,
 };
 
diff --git a/lib_pypy/cffi/recompiler.py b/lib_pypy/cffi/recompiler.py
--- a/lib_pypy/cffi/recompiler.py
+++ b/lib_pypy/cffi/recompiler.py
@@ -392,7 +392,7 @@
         #
         # the init function
         prnt('#ifdef PYPY_VERSION')
-        prnt('void')
+        prnt('PyMODINIT_FUNC')
         prnt('_cffi_pypyinit_%s(const void *p[])' % (base_module_name,))
         prnt('{')
         if self._num_externpy: