From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Wed, 12 Oct 2011 23:12:34 +0000 (+0200)
Subject: Don't use PyUnicode_MAX_CHAR_VALUE() macro in Py_MAX()
X-Git-Tag: v3.3.0a1~1185
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=127226ba6958fbfe69d74220b9bda70af9fdafd8;p=python

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

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 5766237ed1..cb03300c62 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -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(