[Python-checkins] cpython (merge 3.2 -> default): #11942: merge with 3.2.

Wed Apr 27 23:54:03 CEST 2011

http://hg.python.org/cpython/rev/1cdcd1a25025
changeset: 69642:1cdcd1a25025
parent: 69638:c8f283cd3e6e
parent: 69641:119c7219b1ac
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Thu Apr 28 00:53:48 2011 +0300
summary:
 #11942: merge with 3.2.
files:
 Doc/c-api/init.rst | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@ -908,7 +908,7 @@
 main thread where it has possession of the global interpreter lock and can
 perform any Python API calls.
 
-.. c:function:: void Py_AddPendingCall(int (*func)(void *), void *arg)
+.. c:function:: int Py_AddPendingCall(int (*func)(void *), void *arg)
 
 .. index:: single: Py_AddPendingCall()
 
-- 
Repository URL: http://hg.python.org/cpython
