From 127226ba6958fbfe69d74220b9bda70af9fdafd8 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 13 Oct 2011 01:12:34 +0200 Subject: Don't use PyUnicode_MAX_CHAR_VALUE() macro in Py_MAX() --- Objects/unicodeobject.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 @@ 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( -- cgit v0.12