[pypy-commit] pypy py3k: Fix cpyext compilation.

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3k
Changeset: r59299:4a230275589d
Date: 2012-12-03 22:50 +0100
http://bitbucket.org/pypy/pypy/changeset/4a230275589d/

Log:	Fix cpyext compilation.

diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py
--- a/pypy/module/cpyext/api.py
+++ b/pypy/module/cpyext/api.py
@@ -640,7 +640,7 @@
                                TP, compilation_info=eci)
         globals()['va_get_%s' % name_no_star] = func
 
-def setup_init_functions(eci):
+def setup_init_functions(eci, translating):
     init_pycobject = rffi.llexternal('init_pycobject', [], lltype.Void,
                                      compilation_info=eci, _nowrapper=True)
     init_capsule = rffi.llexternal('init_capsule', [], lltype.Void,
@@ -650,7 +650,7 @@
         lambda space: init_capsule(),
     ])
     from pypy.module.posix.interp_posix import add_fork_hook
-    if we_are_translated():
+    if translating:
         reinit_tls = rffi.llexternal('PyThread_ReInitTLS', [], lltype.Void,
                                      compilation_info=eci)
     else:
@@ -807,7 +807,7 @@
 
     setup_va_functions(eci)
 
-    setup_init_functions(eci)
+    setup_init_functions(eci, translating=False)
     return modulename.new(ext='')
 
 def generate_macros(export_symbols, rename=True, do_deref=True):
@@ -1022,7 +1022,7 @@
         deco = entrypoint("cpyext", func.argtypes, name, relax=True)
         deco(func.get_wrapper(space))
 
-    setup_init_functions(eci)
+    setup_init_functions(eci, translating=True)
     trunk_include = pypydir.dirpath() / 'include'
     copy_header_files(trunk_include)