Author: Armin Rigo <[email protected]>
Branch: stmgc-c7
Changeset: r69971:6983332fc29c
Date: 2014-03-15 09:27 +0100
http://bitbucket.org/pypy/pypy/changeset/6983332fc29c/
Log: hg merge default
diff --git a/pypy/module/cpyext/pystate.py b/pypy/module/cpyext/pystate.py
--- a/pypy/module/cpyext/pystate.py
+++ b/pypy/module/cpyext/pystate.py
@@ -213,7 +213,7 @@
if rffi.aroundstate.after:
# After external call is before entering Python
rffi.aroundstate.after()
- return 0
+ return lltype.nullptr(PyGILState_STATE.TO)
@cpython_api([PyGILState_STATE], lltype.Void)
def PyGILState_Release(space, state):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
