[Python-checkins] cpython: Oops, fix Py_MIN/Py_MAX case

Wed Sep 28 22:17:17 CEST 2011

http://hg.python.org/cpython/rev/9d06a9408ca3
changeset: 72499:9d06a9408ca3
user: Victor Stinner <victor.stinner at haypocalc.com>
date: Wed Sep 28 22:17:19 2011 +0200
summary:
 Oops, fix Py_MIN/Py_MAX case
files:
 Objects/unicodeobject.c | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -622,7 +622,7 @@
 if (PyUnicode_READY(to))
 return -1;
 
- how_many = PY_MIN(PyUnicode_GET_LENGTH(from), how_many);
+ how_many = Py_MIN(PyUnicode_GET_LENGTH(from), how_many);
 if (to_start + how_many > PyUnicode_GET_LENGTH(to)) {
 PyErr_Format(PyExc_ValueError,
 "Cannot write %zi characters at %zi "
@@ -9472,7 +9472,7 @@
 goto onError;
 
 maxchar = PyUnicode_MAX_CHAR_VALUE(u);
- maxchar = PY_MAX(maxchar, PyUnicode_MAX_CHAR_VALUE(v));
+ maxchar = Py_MAX(maxchar, PyUnicode_MAX_CHAR_VALUE(v));
 
 /* Concat the two Unicode strings */
 w = PyUnicode_New(
-- 
Repository URL: http://hg.python.org/cpython
