[Python-checkins] r79335 - in python/branches/release31-maint: Objects/unicodeobject.c

[victor.stinner]

Author: victor.stinner
Date: Tue Mar 23 12:43:20 2010
New Revision: 79335

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Objects/unicodeobject.c

Modified: python/branches/release31-maint/Objects/unicodeobject.c
==============================================================================
--- python/branches/release31-maint/Objects/unicodeobject.c	(original)
+++ python/branches/release31-maint/Objects/unicodeobject.c	Tue Mar 23 12:43:20 2010
@@ -2513,7 +2513,9 @@
                 *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));