From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 20 Dec 2018 21:52:09 +0000 (-0800)
Subject: bpo-35259: Limit `Py_FinalizeEx()` to `Py_LIMITED_API >= 0x03060000`. (GH-10620)... 
X-Git-Tag: v3.6.8~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5241ecff161ccf34083b6a824d1ae6d79917d889;p=thirdparty%2FPython%2Fcpython.git

bpo-35259: Limit `Py_FinalizeEx()` to `Py_LIMITED_API >= 0x03060000`. (GH-10620) (GH-11269)

(cherry picked from commit 3e8f962e63c2f929604443531a9a3aced242f3e8)

Co-authored-by: Arthur Neufeld <aneufeld@seinesoftware.ca>
---

diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h
index 01abfa9fcd6f..9a528218e481 100644
--- a/Include/pylifecycle.h
+++ b/Include/pylifecycle.h
@@ -27,7 +27,9 @@ PyAPI_FUNC(void) Py_InitializeEx(int);
 PyAPI_FUNC(void) _Py_InitializeEx_Private(int, int);
 #endif
 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);
 PyAPI_FUNC(PyThreadState *) Py_NewInterpreter(void);
 PyAPI_FUNC(void) Py_EndInterpreter(PyThreadState *);
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 000000000000..1f4801cbfb71
--- /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.