From: Georg Brandl <georg@python.org>
Date: Sun, 17 Oct 2010 11:48:07 +0000 (+0000)
Subject: Merged revisions 81936 via svnmerge from
X-Git-Tag: v3.1.3rc1~106
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ded5acf34ae0185a4b19ed213eec4c2cdfda7060;p=python

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.
........
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index b50293c89c..f875e10900 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. */