summaryrefslogtreecommitdiff
path: root/Include/pylifecycle.h
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-12-05 22:31:12 -0800
committerBenjamin Peterson <benjamin@python.org>2016-12-05 22:31:12 -0800
commit04de8342d1cc6f55240b183991e52df1f3bfa459 (patch)
tree4f222f84e5a9f895141dd16c5bb30070faacd4a7 /Include/pylifecycle.h
parent6980f5f3bb35266ae50b1670ad3aa409d74a60bd (diff)
parentc6e49d6743e00989891c03edf2f0a76592169b9d (diff)
downloadcpython-04de8342d1cc6f55240b183991e52df1f3bfa459.tar.gz
merge 3.5
Diffstat (limited to 'Include/pylifecycle.h')
-rw-r--r--Include/pylifecycle.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h
index ccdebe26a4..5a67666874 100644
--- a/Include/pylifecycle.h
+++ b/Include/pylifecycle.h
@@ -27,6 +27,7 @@ PyAPI_FUNC(void) Py_InitializeEx(int);
PyAPI_FUNC(void) _Py_InitializeEx_Private(int, int);
#endif
PyAPI_FUNC(void) Py_Finalize(void);
+PyAPI_FUNC(int) Py_FinalizeEx(void);
PyAPI_FUNC(int) Py_IsInitialized(void);
PyAPI_FUNC(PyThreadState *) Py_NewInterpreter(void);
PyAPI_FUNC(void) Py_EndInterpreter(PyThreadState *);
@@ -106,6 +107,7 @@ PyAPI_FUNC(void) _PyGC_Fini(void);
PyAPI_FUNC(void) PySlice_Fini(void);
PyAPI_FUNC(void) _PyType_Fini(void);
PyAPI_FUNC(void) _PyRandom_Fini(void);
+PyAPI_FUNC(void) PyAsyncGen_Fini(void);
PyAPI_DATA(PyThreadState *) _Py_Finalizing;
#endif
@@ -115,8 +117,11 @@ typedef void (*PyOS_sighandler_t)(int);
PyAPI_FUNC(PyOS_sighandler_t) PyOS_getsig(int);
PyAPI_FUNC(PyOS_sighandler_t) PyOS_setsig(int, PyOS_sighandler_t);
+#ifndef Py_LIMITED_API
/* Random */
-PyAPI_FUNC(int) _PyOS_URandom (void *buffer, Py_ssize_t size);
+PyAPI_FUNC(int) _PyOS_URandom(void *buffer, Py_ssize_t size);
+PyAPI_FUNC(int) _PyOS_URandomNonblock(void *buffer, Py_ssize_t size);
+#endif /* !Py_LIMITED_API */
#ifdef __cplusplus
}