summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-10-17 11:48:07 (GMT)
committerGeorg Brandl <georg@python.org>2010-10-17 11:48:07 (GMT)
commitded5acf34ae0185a4b19ed213eec4c2cdfda7060 (patch)
tree4b1da2de723ec14cf5f5243b3648623ca3b09c46
parent378e6db834488d585f90f358d23d7d33a81ec854 (diff)
downloadcpython-ded5acf34ae0185a4b19ed213eec4c2cdfda7060.zip
cpython-ded5acf34ae0185a4b19ed213eec4c2cdfda7060.tar.gz
cpython-ded5acf34ae0185a4b19ed213eec4c2cdfda7060.tar.bz2
Merged revisions 81936 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ........ r81936 | mark.dickinson | 2010-06-12 11:10:14 +0200 (Sa, 12 Jun 2010) | 2 lines Silence 'unused variable' gcc warning. Patch by Éric Araujo. ........
-rw-r--r--Objects/unicodeobject.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index b50293c..f875e10 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -2616,10 +2616,11 @@ PyUnicode_DecodeUTF32Stateful(const char *s,
Py_UNICODE *p;
#ifndef Py_UNICODE_WIDE
int pairs = 0;
+ const unsigned char *qq;
#else
const int pairs = 0;
#endif
- const unsigned char *q, *e, *qq;
+ const unsigned char *q, *e;
int bo = 0; /* assume native ordering by default */
const char *errmsg = "";
/* Offsets from q for retrieving bytes in the right order. */