From f43b293f2fee91578e28c7aa566510a0cd6e33cb Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Thu, 25 May 2017 15:32:08 +0300 Subject: [PATCH] [3.6] bpo-29943: Do not replace the function PySlice_GetIndicesEx() with a macro (GH-1049) (#1813) if Py_LIMITED_API is not defined. (cherry picked from commit 49a9059) --- Include/sliceobject.h | 2 ++ Misc/NEWS | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/Include/sliceobject.h b/Include/sliceobject.h index 3626354460..579ac073d0 100644 --- a/Include/sliceobject.h +++ b/Include/sliceobject.h @@ -45,11 +45,13 @@ PyAPI_FUNC(int) PySlice_GetIndicesEx(PyObject *r, Py_ssize_t length, Py_ssize_t *step, Py_ssize_t *slicelength); #if !defined(Py_LIMITED_API) || (Py_LIMITED_API+0 >= 0x03050400 && Py_LIMITED_API+0 < 0x03060000) || Py_LIMITED_API+0 >= 0x03060100 +#ifdef Py_LIMITED_API #define PySlice_GetIndicesEx(slice, length, start, stop, step, slicelen) ( \ PySlice_Unpack((slice), (start), (stop), (step)) < 0 ? \ ((*(slicelen) = 0), -1) : \ ((*(slicelen) = PySlice_AdjustIndices((length), (start), (stop), *(step))), \ 0)) +#endif PyAPI_FUNC(int) PySlice_Unpack(PyObject *slice, Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step); PyAPI_FUNC(Py_ssize_t) PySlice_AdjustIndices(Py_ssize_t length, diff --git a/Misc/NEWS b/Misc/NEWS index 09eb4a76df..58a2ee0c3e 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -153,6 +153,13 @@ Library exception) to exception(s) raised in the dispatched methods. Patch by Petr Motejlek. +C API +----- + +- Issue #27867: Function PySlice_GetIndicesEx() no longer replaced with a macro + if Py_LIMITED_API is not set. + + Build ----- -- 2.40.0