Oops, fix Py_MIN/Py_MAX case

This commit is contained in:
Victor Stinner 2011-09-28 22:17:19 +02:00
parent 17222160e7
commit ff9e50fd04

View file

@ -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(