diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2017-01-25 13:23:05 +0200 |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2017-01-25 13:23:05 +0200 |
| commit | b2a5be0763ee572bed431335eb4712fac94f5a7b (patch) | |
| tree | 9960001b9d6da0e974b3af426d2a1a16b5d8829e /Include/sliceobject.h | |
| parent | 07a1f65a9362810e186059ef96e5b9cb19cb9e44 (diff) | |
| download | cpython-git-b2a5be0763ee572bed431335eb4712fac94f5a7b.tar.gz | |
Issue #27867: Function PySlice_GetIndicesEx() is replaced with a macro if
Py_LIMITED_API is not set or set to the value between 0x03050400
and 0x03060000 (not including) or 0x03060100 or higher.
Diffstat (limited to 'Include/sliceobject.h')
| -rw-r--r-- | Include/sliceobject.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/Include/sliceobject.h b/Include/sliceobject.h index 26370e0175..5359369012 100644 --- a/Include/sliceobject.h +++ b/Include/sliceobject.h @@ -41,8 +41,20 @@ PyAPI_FUNC(int) _PySlice_GetLongIndices(PySliceObject *self, PyObject *length, PyAPI_FUNC(int) PySlice_GetIndices(PyObject *r, Py_ssize_t length, Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step); PyAPI_FUNC(int) PySlice_GetIndicesEx(PyObject *r, Py_ssize_t length, - Py_ssize_t *start, Py_ssize_t *stop, - Py_ssize_t *step, Py_ssize_t *slicelength); + Py_ssize_t *start, Py_ssize_t *stop, + 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 +#define PySlice_GetIndicesEx(slice, length, start, stop, step, slicelen) ( \ + PySlice_Unpack((slice), (start), (stop), (step)) < 0 ? -1 : \ + ((*slicelen = PySlice_AdjustIndices((length), (start), (stop), *(step))), \ + 0)) +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, + Py_ssize_t *start, Py_ssize_t *stop, + Py_ssize_t step); +#endif #ifdef __cplusplus } |