diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-04-22 20:07:28 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-04-22 20:07:28 (GMT) |
| commit | 0b79b76c2b8a4d4de7f29b8402def74fd63be706 (patch) | |
| tree | 2359fedce890d7fc449cde8cfe059392e90556c4 | |
| parent | 158701d8866b0cb53953bf0ae0fd2834be766da1 (diff) | |
| download | cpython-0b79b76c2b8a4d4de7f29b8402def74fd63be706.zip cpython-0b79b76c2b8a4d4de7f29b8402def74fd63be706.tar.gz cpython-0b79b76c2b8a4d4de7f29b8402def74fd63be706.tar.bz2 | |
Merged revisions 80384 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r80384 | victor.stinner | 2010-04-22 22:01:57 +0200 (jeu., 22 avril 2010) | 2 lines
Fix my previous commit (r80382) for wide build (unicodeobject.c)
........
| -rw-r--r-- | Objects/unicodeobject.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 4a0746f..a9ff3b3 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -2481,9 +2481,8 @@ PyUnicode_EncodeUTF8(const Py_UNICODE *s, *p++ = (char)(0x80 | ((ch >> 12) & 0x3f)); *p++ = (char)(0x80 | ((ch >> 6) & 0x3f)); *p++ = (char)(0x80 | (ch & 0x3f)); - -#endif } else { +#endif Py_ssize_t newpos; PyObject *rep; Py_ssize_t repsize, k; @@ -2543,7 +2542,9 @@ PyUnicode_EncodeUTF8(const Py_UNICODE *s, } } Py_DECREF(rep); +#ifndef Py_UNICODE_WIDE } +#endif } else if (ch < 0x10000) { *p++ = (char)(0xe0 | (ch >> 12)); *p++ = (char)(0x80 | ((ch >> 6) & 0x3f)); |