summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Neufeld <aneufeld@seinesoftware.ca>2018-12-20 21:11:03 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2018-12-20 21:11:03 (GMT)
commit3e8f962e63c2f929604443531a9a3aced242f3e8 (patch)
tree34ff55fbc6be045ed67596af995c55efe1da3f2d
parent9a8d1d7562b11969034b92217fe66aab7a951fb6 (diff)
downloadcpython-3e8f962e63c2f929604443531a9a3aced242f3e8.zip
cpython-3e8f962e63c2f929604443531a9a3aced242f3e8.tar.gz
cpython-3e8f962e63c2f929604443531a9a3aced242f3e8.tar.bz2
bpo-35259: Limit `Py_FinalizeEx()` to `Py_LIMITED_API >= 0x03060000`. (GH-10620)
-rw-r--r--Include/pylifecycle.h2
-rw-r--r--Misc/NEWS.d/next/C API/2018-11-22-13-52-36.bpo-35259.p07c61.rst2
2 files changed, 4 insertions, 0 deletions
diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h
index 5419bc9..1df114a 100644
--- a/Include/pylifecycle.h
+++ b/Include/pylifecycle.h
@@ -12,7 +12,9 @@ extern "C" {
PyAPI_FUNC(void) Py_Initialize(void);
PyAPI_FUNC(void) Py_InitializeEx(int);
PyAPI_FUNC(void) Py_Finalize(void);
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
PyAPI_FUNC(int) Py_FinalizeEx(void);
+#endif
PyAPI_FUNC(int) Py_IsInitialized(void);
/* Subinterpreter support */
diff --git a/Misc/NEWS.d/next/C API/2018-11-22-13-52-36.bpo-35259.p07c61.rst b/Misc/NEWS.d/next/C API/2018-11-22-13-52-36.bpo-35259.p07c61.rst
new file mode 100644
index 0000000..1f4801c
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2018-11-22-13-52-36.bpo-35259.p07c61.rst
@@ -0,0 +1,2 @@
+Conditionally declare :c:func:`Py_FinalizeEx()` (new in 3.6) based on
+Py_LIMITED_API. Patch by Arthur Neufeld.