diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-10-12 23:12:34 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-10-12 23:12:34 (GMT) |
| commit | 127226ba6958fbfe69d74220b9bda70af9fdafd8 (patch) | |
| tree | 6db5b31c65d110f3ad5ccbbdac503ed07b88e9fb | |
| parent | 8813104e5340ca4f1a6988b33cc551e009bae16b (diff) | |
| download | cpython-127226ba6958fbfe69d74220b9bda70af9fdafd8.zip cpython-127226ba6958fbfe69d74220b9bda70af9fdafd8.tar.gz cpython-127226ba6958fbfe69d74220b9bda70af9fdafd8.tar.bz2 | |
Don't use PyUnicode_MAX_CHAR_VALUE() macro in Py_MAX()
| -rw-r--r-- | Objects/unicodeobject.c | 5 |
1 files 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( |