From 5241ecff161ccf34083b6a824d1ae6d79917d889 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Thu, 20 Dec 2018 13:52:09 -0800 Subject: bpo-35259: Limit `Py_FinalizeEx()` to `Py_LIMITED_API >= 0x03060000`. (GH-10620) (GH-11269) (cherry picked from commit 3e8f962e63c2f929604443531a9a3aced242f3e8) Co-authored-by: Arthur Neufeld --- Include/pylifecycle.h | 2 ++ Misc/NEWS.d/next/C API/2018-11-22-13-52-36.bpo-35259.p07c61.rst | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 Misc/NEWS.d/next/C API/2018-11-22-13-52-36.bpo-35259.p07c61.rst diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h index 01abfa9..9a52821 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 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. -- cgit v0.12