From: Brian Curtin <brian@python.org>
Date: Wed, 2 Nov 2011 20:09:37 +0000 (-0500)
Subject: Fix a compile error (apparently Windows only) introduced in 295fdfd4f422
X-Git-Tag: v3.3.0a1~970
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2787ea41fd11b8e0a0514e13b61af8e12764a8f6;p=thirdparty%2FPython%2Fcpython.git

Fix a compile error (apparently Windows only) introduced in 295fdfd4f422
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 0ecbd1d4ae6b..73f79268119b 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -8213,6 +8213,7 @@ charmap_encoding_error(
     char *reason = "character maps to <undefined>";
     charmapencode_result x;
     Py_UCS4 ch;
+    int val;
 
     if (PyUnicode_READY(unicode) < 0)
         return -1;
@@ -8222,8 +8223,8 @@ charmap_encoding_error(
         PyObject *rep;
         if (Py_TYPE(mapping) == &EncodingMapType) {
             ch = PyUnicode_READ_CHAR(unicode, collendpos);
-            int res = encoding_map_lookup(ch, mapping);
-            if (res != -1)
+            val = encoding_map_lookup(ch, mapping);
+            if (val != -1)
                 break;
             ++collendpos;
             continue;