commit 127226ba6958fbfe69d74220b9bda70af9fdafd8
author Victor Stinner <victor.stinner@haypocalc.com> Thu Oct 13 01:12:34 2011 +0200
committer Victor Stinner <victor.stinner@haypocalc.com> Thu Oct 13 01:12:34 2011 +0200
tree 6db5b31c65d110f3ad5ccbbdac503ed07b88e9fb
parent 8813104e5340ca4f1a6988b33cc551e009bae16b

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

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 5766237..cb03300 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -10257,7 +10257,7 @@
 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 @@
     }
 
     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(