Don't use PyUnicode_MAX_CHAR_VALUE() macro in Py_MAX()

This commit is contained in:
Victor Stinner 2011-10-13 01:12:34 +02:00
parent 8813104e53
commit 127226ba69
1 changed files with 3 additions and 2 deletions

View File

@ -10257,7 +10257,7 @@ PyObject *
PyUnicode_Concat(PyObject *left, PyObject *right)
{
PyObject *u = NULL, *v = NULL, *w;
Py_UCS4 maxchar;
Py_UCS4 maxchar, maxchar2;
/* Coerce the two arguments */
u = PyUnicode_FromObject(left);
@ -10278,7 +10278,8 @@ PyUnicode_Concat(PyObject *left, PyObject *right)
}
maxchar = PyUnicode_MAX_CHAR_VALUE(u);
maxchar = Py_MAX(maxchar, PyUnicode_MAX_CHAR_VALUE(v));
maxchar2 = PyUnicode_MAX_CHAR_VALUE(v);
maxchar = Py_MAX(maxchar, maxchar2);
/* Concat the two Unicode strings */
w = PyUnicode_New(