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

[ezio.melotti]

http://hg.python.org/cpython/rev/119c7219b1ac
changeset:   69641:119c7219b1ac
branch:      3.2
parent:      69637:7b7ad9a88451
parent:      69640:fd1f47a57ba2
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Apr 28 00:53:14 2011 +0300
summary:
  #11942: merge with 3.1.

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