summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2017-02-04 09:10:25 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2017-02-04 09:10:25 (GMT)
commited45f739b6dee0becb555a315c0d04196c9d887d (patch)
tree7b34344adaa14732e0c33e8c118749cdcd3866ed
parent522a60c10d4a0dde3b1e7c0b90c430105e07d34f (diff)
downloadcpython-ed45f739b6dee0becb555a315c0d04196c9d887d.zip
cpython-ed45f739b6dee0becb555a315c0d04196c9d887d.tar.gz
cpython-ed45f739b6dee0becb555a315c0d04196c9d887d.tar.bz2
Issue #27867: Fixed merging error.
-rw-r--r--Include/sliceobject.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Include/sliceobject.h b/Include/sliceobject.h
index 445a8d8..71e2818 100644
--- a/Include/sliceobject.h
+++ b/Include/sliceobject.h
@@ -41,7 +41,7 @@ PyAPI_FUNC(int) PySlice_GetIndicesEx(PySliceObject *r, Py_ssize_t length,
#define PySlice_GetIndicesEx(slice, length, start, stop, step, slicelen) ( \
_PySlice_Unpack((PyObject *)(slice), (start), (stop), (step)) < 0 ? \
((*(slicelen) = 0), -1) : \
- ((*(slicelen) = PySlice_AdjustIndices((length), (start), (stop), *(step))), \
+ ((*(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);