From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Wed, 28 Sep 2011 20:17:19 +0000 (+0200)
Subject: Oops, fix Py_MIN/Py_MAX case
X-Git-Tag: v3.3.0a1~1465
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff9e50fd047399873059328d992db0bfe32bfe10;p=thirdparty%2FPython%2Fcpython.git

Oops, fix Py_MIN/Py_MAX case
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 69f0b8fce915..b53c21042889 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -622,7 +622,7 @@ PyUnicode_CopyCharacters(PyObject *to, Py_ssize_t to_start,
     if (PyUnicode_READY(to))
         return -1;
 
-    how_many = PY_MIN(PyUnicode_GET_LENGTH(from), how_many);
+    how_many = Py_MIN(PyUnicode_GET_LENGTH(from), how_many);
     if (to_start + how_many > PyUnicode_GET_LENGTH(to)) {
         PyErr_Format(PyExc_ValueError,
                      "Cannot write %zi characters at %zi "
@@ -9472,7 +9472,7 @@ PyUnicode_Concat(PyObject *left, PyObject *right)
         goto onError;
 
     maxchar = PyUnicode_MAX_CHAR_VALUE(u);
-    maxchar = PY_MAX(maxchar, PyUnicode_MAX_CHAR_VALUE(v));
+    maxchar = Py_MAX(maxchar, PyUnicode_MAX_CHAR_VALUE(v));
 
     /* Concat the two Unicode strings */
     w = PyUnicode_New(