]> granicus.if.org Git - python/commitdiff
Don't use PyUnicode_MAX_CHAR_VALUE() macro in Py_MAX()
authorVictor Stinner <victor.stinner@haypocalc.com>
Wed, 12 Oct 2011 23:12:34 +0000 (01:12 +0200)
committerVictor Stinner <victor.stinner@haypocalc.com>
Wed, 12 Oct 2011 23:12:34 +0000 (01:12 +0200)
Objects/unicodeobject.c

index 5766237ed15735442ec19f25cdbad71ca1348edf..cb03300c621ec53d7e94dd0d72c7d9e336974bf2 100644 (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(