diff options
| author | Fredrik Lundh <fredrik@pythonware.com> | 2001-06-26 15:11:00 (GMT) |
|---|---|---|
| committer | Fredrik Lundh <fredrik@pythonware.com> | 2001-06-26 15:11:00 (GMT) |
| commit | 3083163dc12024e9d46d4e2d752645256b7ba7c3 (patch) | |
| tree | f7d0dee10edf6b5c6682b83cbc2c69b187eb3b2a | |
| parent | ba1867304503e76f8cb64cb87fe97c008ac956d7 (diff) | |
| download | cpython-3083163dc12024e9d46d4e2d752645256b7ba7c3.zip cpython-3083163dc12024e9d46d4e2d752645256b7ba7c3.tar.gz cpython-3083163dc12024e9d46d4e2d752645256b7ba7c3.tar.bz2 | |
experimental UCS-4 support: don't assume that MS_WIN32 implies
HAVE_USABLE_WCHAR_T
| -rw-r--r-- | Modules/_codecsmodule.c | 6 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c index ea530ee..61f25d1 100644 --- a/Modules/_codecsmodule.c +++ b/Modules/_codecsmodule.c @@ -299,7 +299,7 @@ charmap_decode(PyObject *self, size); } -#ifdef MS_WIN32 +#if defined(MS_WIN32) && defined(HAVE_USABLE_WCHAR_T) static PyObject * mbcs_decode(PyObject *self, @@ -595,7 +595,7 @@ charmap_encode(PyObject *self, return v; } -#ifdef MS_WIN32 +#if defined(MS_WIN32) && defined(HAVE_USABLE_WCHAR_T) static PyObject * mbcs_encode(PyObject *self, @@ -650,7 +650,7 @@ static PyMethodDef _codecs_functions[] = { {"charmap_decode", charmap_decode, 1}, {"readbuffer_encode", readbuffer_encode, 1}, {"charbuffer_encode", charbuffer_encode, 1}, -#ifdef MS_WIN32 +#if defined(MS_WIN32) && defined(HAVE_USABLE_WCHAR_T) {"mbcs_encode", mbcs_encode, 1}, {"mbcs_decode", mbcs_decode, 1}, #endif diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 4bb8fb2..ba606f5 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -1379,7 +1379,7 @@ PyObject *unicodeescape_string(const Py_UNICODE *s, while (size-- > 0) { Py_UNICODE ch = *s++; /* Escape quotes */ - if (quotes && (ch == q[1] || ch == '\\')) { + if (quotes && (ch == (Py_UNICODE) q[1] || ch == '\\')) { *p++ = '\\'; *p++ = (char) ch; } @@ -1831,7 +1831,7 @@ PyObject *PyUnicode_AsASCIIString(PyObject *unicode) NULL); } -#ifdef MS_WIN32 +#if defined(MS_WIN32) && defined(HAVE_USABLE_WCHAR_T) /* --- MBCS codecs for Windows -------------------------------------------- */ |