mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-15 21:44:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Issue #9642: Uniformize the tests on the availability of the mbcs codec

Browse source 
Add a new HAVE_MBCS define.
This commit is contained in:
Victor Stinner 2011-07-04 14:23:54 +02:00
parent 9122fdd8fa
commit 99b9538636
6 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Modules/_codecsmodule.c
View file

@ -588,7 +588,7 @@ charmap_decode(PyObject *self,
return codec_tuple(unicode, pbuf.len);
}
#if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
#ifdef HAVE_MBCS
static PyObject *
mbcs_decode(PyObject *self,
@ -613,7 +613,7 @@ mbcs_decode(PyObject *self,
return codec_tuple(decoded, consumed);
}
#endif /* MS_WINDOWS */
#endif /* HAVE_MBCS */
/* --- Encoder ------------------------------------------------------------ */
@ -989,7 +989,7 @@ charmap_build(PyObject *self, PyObject *args)
return PyUnicode_BuildEncodingMap(map);
}
#if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
#ifdef HAVE_MBCS
static PyObject *
mbcs_encode(PyObject *self,
@ -1014,7 +1014,7 @@ mbcs_encode(PyObject *self,
return v;
}
#endif /* MS_WINDOWS */
#endif /* HAVE_MBCS */
/* --- Error handler registry --------------------------------------------- */
@ -1101,7 +1101,7 @@ static PyMethodDef _codecs_functions[] = {
{"charmap_decode", charmap_decode, METH_VARARGS},
{"charmap_build", charmap_build, METH_VARARGS},
{"readbuffer_encode", readbuffer_encode, METH_VARARGS},
#if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
#ifdef HAVE_MBCS
{"mbcs_encode", mbcs_encode, METH_VARARGS},
{"mbcs_decode", mbcs_decode, METH_VARARGS},
#endif

2
Modules/timemodule.c
View file

@ -43,7 +43,7 @@ static long main_thread;
#endif /* MS_WINDOWS */
#endif /* !__WATCOMC__ || __QNX__ */
#if defined(MS_WINDOWS)
#if defined(HAVE_MBCS)
# define TZNAME_ENCODING "mbcs"
#else
# define TZNAME_ENCODING "utf-8"