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 2ccec90c089d4c060451a95819cd2ac78b566d23..c9ff05979264de367b5f518a6a207513fb804cec 100644 (file)
--- 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));