summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2000-03-28 20:29:59 (GMT)
committerGuido van Rossum <guido@python.org>2000-03-28 20:29:59 (GMT)
commit24bdb0474fca186da95dc045f157074e4d57c6b6 (patch)
treef3dc1f458303217ae0b3ecbff23d7dfe5e7b6d13 /Include
parent66d451397577a7710902b75104839afc7ca05b81 (diff)
downloadcpython-24bdb0474fca186da95dc045f157074e4d57c6b6.zip
cpython-24bdb0474fca186da95dc045f157074e4d57c6b6.tar.gz
cpython-24bdb0474fca186da95dc045f157074e4d57c6b6.tar.bz2
Marc-Andre Lemburg:
The attached patch set includes a workaround to get Python with Unicode compile on BSDI 4.x (courtesy Thomas Wouters; the cause is a bug in the BSDI wchar.h header file) and Python interfaces for the MBCS codec donated by Mark Hammond. Also included are some minor corrections w/r to the docs of the new "es" and "es#" parser markers (use PyMem_Free() instead of free(); thanks to Mark Hammond for finding these). The unicodedata tests are now in a separate file (test_unicodedata.py) to avoid problems if the module cannot be found.
Diffstat (limited to 'Include')
-rw-r--r--Include/unicodeobject.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
index e9e60d8..cfc8126 100644
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -82,6 +82,10 @@ Unicode Integration Proposal (see file Misc/unicode.txt).
#endif
#ifdef HAVE_WCHAR_H
+/* Work around a cosmetic bug in BSDI 4.x wchar.h; thanks to Thomas Wouters */
+# ifdef _HAVE_BSDI
+# include <time.h>
+# endif
# include "wchar.h"
#endif
@@ -562,7 +566,9 @@ extern DL_IMPORT(PyObject *) PyUnicode_TranslateCharmap(
);
#ifdef MS_WIN32
+
/* --- MBCS codecs for Windows -------------------------------------------- */
+
extern DL_IMPORT(PyObject*) PyUnicode_DecodeMBCS(
const char *string, /* MBCS encoded string */
int length, /* size of string */
@@ -579,8 +585,8 @@ extern DL_IMPORT(PyObject*) PyUnicode_EncodeMBCS(
const char *errors /* error handling */
);
-
#endif /* MS_WIN32 */
+
/* --- Methods & Slots ----------------------------------------------------
These are capable of handling Unicode objects and strings on input