From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Wed, 27 Apr 2011 21:53:14 +0000 (+0300)
Subject: #11942: merge with 3.1.
X-Git-Tag: v3.2.1b1~66
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a782ccaf6c75294a760a52e06ddb8d4ecd893311;p=thirdparty%2FPython%2Fcpython.git

#11942: merge with 3.1.
---

a782ccaf6c75294a760a52e06ddb8d4ecd893311
diff --cc Doc/c-api/init.rst
index 9a78834cdd37,7e9d44ca60d0..e50c417d3668
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@@ -908,7 -892,7 +908,7 @@@ a worker thread and the actual call tha
  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)
 -.. cfunction:: int Py_AddPendingCall(int (*func)(void *), void *arg)
++.. c:function:: int Py_AddPendingCall(int (*func)(void *), void *arg)
  
     .. index:: single: Py_AddPendingCall()