[Python-checkins] cpython (2.7): Issue #27867: Fixed merging error.

[serhiy.storchaka]

https://hg.python.org/cpython/rev/110ec861e5ea
changeset:   106409:110ec861e5ea
branch:      2.7
parent:      106406:17d0cfc64a32
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sat Feb 04 11:10:25 2017 +0200
summary:
  Issue #27867: Fixed merging error.

files:
  Include/sliceobject.h |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Include/sliceobject.h b/Include/sliceobject.h
--- a/Include/sliceobject.h
+++ b/Include/sliceobject.h
@@ -41,7 +41,7 @@
 #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);

-- 
Repository URL: https://hg.python.org/cpython