Fix a compile error (apparently Windows only) introduced in 295fdfd4f422
authorBrian Curtin <brian@python.org>
Wed, 2 Nov 2011 20:09:37 +0000 (15:09 -0500)
committerBrian Curtin <brian@python.org>
Wed, 2 Nov 2011 20:09:37 +0000 (15:09 -0500)
Objects/unicodeobject.c

index 0ecbd1d4ae6b05558fe31ef3df5ab482f41d99d3..73f79268119b09bb4302834906fb4299500c4328 100644 (file)
@@ -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;