diff options
| author | Barry Warsaw <barry@python.org> | 2000-03-20 16:36:48 +0000 |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2000-03-20 16:36:48 +0000 |
| commit | 51ac58039f62ef9d605974dae32a6ada9c26039b (patch) | |
| tree | c8aee44da7330978efe15671b2c9e98bc898eea3 /Include | |
| parent | abc411bac883c1706a9dcc8b1bea85a0b940cbfb (diff) | |
| download | cpython-git-51ac58039f62ef9d605974dae32a6ada9c26039b.tar.gz | |
On 17-Mar-2000, Marc-Andre Lemburg said:
Attached you find an update of the Unicode implementation.
The patch is against the current CVS version. I would appreciate
if someone with CVS checkin permissions could check the changes
in.
The patch contains all bugs and patches sent this week and also
fixes a leak in the codecs code and a bug in the free list code
for Unicode objects (which only shows up when compiling Python
with Py_DEBUG; thanks to MarkH for spotting this one).
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/unicodeobject.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h index 37f2b0d3f4..770ecab52c 100644 --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -1,8 +1,5 @@ #ifndef Py_UNICODEOBJECT_H #define Py_UNICODEOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif /* @@ -109,8 +106,9 @@ typedef unsigned short Py_UNICODE; /* --- Internal Unicode Operations ---------------------------------------- */ /* If you want Python to use the compiler's wctype.h functions instead - of the ones supplied with Python, define WANT_WCTYPE_FUNCTIONS. - This reduces the interpreter's code size. */ + of the ones supplied with Python, define WANT_WCTYPE_FUNCTIONS or + configure Python using --with-ctype-functions. This reduces the + interpreter's code size. */ #if defined(HAVE_USABLE_WCHAR_T) && defined(WANT_WCTYPE_FUNCTIONS) @@ -169,6 +167,10 @@ typedef unsigned short Py_UNICODE; (!memcmp((string)->str + (offset), (substring)->str,\ (substring)->length*sizeof(Py_UNICODE))) +#ifdef __cplusplus +extern "C" { +#endif + /* --- Unicode Type ------------------------------------------------------- */ typedef struct { @@ -647,7 +649,7 @@ extern DL_IMPORT(int) PyUnicode_Find( int direction /* Find direction: +1 forward, -1 backward */ ); -/* Count the number of occurances of substr in str[start:end]. */ +/* Count the number of occurrences of substr in str[start:end]. */ extern DL_IMPORT(int) PyUnicode_Count( PyObject *str, /* String */ @@ -656,7 +658,7 @@ extern DL_IMPORT(int) PyUnicode_Count( int end /* Stop index */ ); -/* Replace at most maxcount occurances of substr in str with replstr +/* Replace at most maxcount occurrences of substr in str with replstr and return the resulting Unicode object. */ extern DL_IMPORT(PyObject *) PyUnicode_Replace( |