From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Tue, 23 Mar 2010 11:43:20 +0000 (+0000)
Subject: Merged revisions 76197 via svnmerge from
X-Git-Tag: v3.1.3rc1~1033
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d526c7cc1c7d8d86f6f47312a79ca68e4deea215;p=python

Merged revisions 76197 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r76197 | benjamin.peterson | 2009-11-10 22:23:15 +0100 (mar., 10 nov. 2009) | 1 line

  death to compiler warning
........
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 2ccec90c08..c9ff059792 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -2513,7 +2513,9 @@ PyUnicode_EncodeUTF8(const Py_UNICODE *s,
                 *p++ = (char)(0x80 | (ch & 0x3f));
                 continue;
             }
+#ifndef Py_UNICODE_WIDE
           encodeUCS4:
+#endif
             /* Encode UCS4 Unicode ordinals */
             *p++ = (char)(0xf0 | (ch >> 18));
             *p++ = (char)(0x80 | ((ch >> 12) & 0x3f));