Skip to content

Commit 3b48b11

Browse files
committed
patch 8.1.0147: compiler warning when building with Python 3.7
Problem: Compiler warning when building with Python 3.7. Solution: #undef PySlice_GetIndicesEx before redefining it. (Ozaki Kiichi, closes #3153)
1 parent f0447e8 commit 3b48b11

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

src/if_python3.c

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,11 @@ typedef PySliceObject PySliceObject_T;
167167
# define PySequence_Fast py3_PySequence_Fast
168168
# define PyTuple_Size py3_PyTuple_Size
169169
# define PyTuple_GetItem py3_PyTuple_GetItem
170+
# if PY_VERSION_HEX >= 0x030601f0
171+
# define PySlice_AdjustIndices py3_PySlice_AdjustIndices
172+
# define PySlice_Unpack py3_PySlice_Unpack
173+
# endif
174+
# undef PySlice_GetIndicesEx
170175
# define PySlice_GetIndicesEx py3_PySlice_GetIndicesEx
171176
# define PyImport_ImportModule py3_PyImport_ImportModule
172177
# define PyObject_Init py3__PyObject_Init
@@ -305,6 +310,12 @@ static Py_ssize_t (*py3_PyTuple_Size)(PyObject *);
305310
static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t);
306311
static int (*py3_PyMapping_Check)(PyObject *);
307312
static PyObject* (*py3_PyMapping_Keys)(PyObject *);
313+
# if PY_VERSION_HEX >= 0x030601f0
314+
static int (*py3_PySlice_AdjustIndices)(Py_ssize_t length,
315+
Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t step);
316+
static int (*py3_PySlice_Unpack)(PyObject *slice,
317+
Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step);
318+
# endif
308319
static int (*py3_PySlice_GetIndicesEx)(PySliceObject_T *r, Py_ssize_t length,
309320
Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step,
310321
Py_ssize_t *slicelen);
@@ -474,6 +485,10 @@ static struct
474485
{"PySequence_Fast", (PYTHON_PROC*)&py3_PySequence_Fast},
475486
{"PyTuple_Size", (PYTHON_PROC*)&py3_PyTuple_Size},
476487
{"PyTuple_GetItem", (PYTHON_PROC*)&py3_PyTuple_GetItem},
488+
# if PY_VERSION_HEX >= 0x030601f0
489+
{"PySlice_AdjustIndices", (PYTHON_PROC*)&py3_PySlice_AdjustIndices},
490+
{"PySlice_Unpack", (PYTHON_PROC*)&py3_PySlice_Unpack},
491+
# endif
477492
{"PySlice_GetIndicesEx", (PYTHON_PROC*)&py3_PySlice_GetIndicesEx},
478493
{"PyErr_NoMemory", (PYTHON_PROC*)&py3_PyErr_NoMemory},
479494
{"Py_Finalize", (PYTHON_PROC*)&py3_Py_Finalize},

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -789,6 +789,8 @@ static char *(features[]) =
789789

790790
static int included_patches[] =
791791
{ /* Add new patch number below this line */
792+
/**/
793+
147,
792794
/**/
793795
146,
794796
/**/

0 commit comments

Comments
 (0)