From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Thu, 20 Dec 2018 21:39:35 +0000 (-0800) Subject: bpo-35259: Limit `Py_FinalizeEx()` to `Py_LIMITED_API >= 0x03060000`. (GH-10620) X-Git-Tag: v3.7.3rc1~222 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1e717588728a23d576c4ead775f7dbd68149696;p=thirdparty%2FPython%2Fcpython.git bpo-35259: Limit `Py_FinalizeEx()` to `Py_LIMITED_API >= 0x03060000`. (GH-10620) (cherry picked from commit 3e8f962e63c2f929604443531a9a3aced242f3e8) Co-authored-by: Arthur Neufeld --- diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h index 8e531cf68baf..05f17dc73f08 100644 --- a/Include/pylifecycle.h +++ b/Include/pylifecycle.h @@ -99,7 +99,9 @@ PyAPI_FUNC(void) Py_InitializeEx(int); PyAPI_FUNC(void) _Py_FatalInitError(_PyInitError err) _Py_NO_RETURN; #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); /* 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 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.