From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 4 Feb 2017 09:10:25 +0000 (+0200)
Subject: Issue #27867: Fixed merging error.
X-Git-Tag: v2.7.14rc1~281
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed45f739b6dee0becb555a315c0d04196c9d887d;p=python

Issue #27867: Fixed merging error.
---

diff --git a/Include/sliceobject.h b/Include/sliceobject.h
index 445a8d87e0..71e281852d 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);