diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-12-19 21:14:45 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-12-19 21:14:45 (GMT) |
| commit | 52e2cc8604fef89bf3dff8eed37af68df7e813ea (patch) | |
| tree | 20d1ed7a341acc95b9bf747e686da722e5c554d2 /Include/unicodeobject.h | |
| parent | 2fa22818bdaf8ab0aec99f7790a938acf22c18b2 (diff) | |
| download | cpython-52e2cc8604fef89bf3dff8eed37af68df7e813ea.zip cpython-52e2cc8604fef89bf3dff8eed37af68df7e813ea.tar.gz cpython-52e2cc8604fef89bf3dff8eed37af68df7e813ea.tar.bz2 | |
backout 7876cd49300d: Move PyUnicode_WCHAR_KIND outside PyUnicode_Kind enum
Diffstat (limited to 'Include/unicodeobject.h')
| -rw-r--r-- | Include/unicodeobject.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h index 60bfcbe..c5480f1 100644 --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -445,13 +445,12 @@ PyAPI_DATA(PyTypeObject) PyUnicodeIter_Type; #define PyUnicode_IS_COMPACT_ASCII(op) \ (((PyASCIIObject*)op)->state.ascii && PyUnicode_IS_COMPACT(op)) +enum PyUnicode_Kind { /* String contains only wstr byte characters. This is only possible when the string was created with a legacy API and _PyUnicode_Ready() has not been called yet. */ -#define PyUnicode_WCHAR_KIND 0 - -/* Return values of the PyUnicode_KIND() macro */ -enum PyUnicode_Kind { + PyUnicode_WCHAR_KIND = 0, +/* Return values of the PyUnicode_KIND() macro: */ PyUnicode_1BYTE_KIND = 1, PyUnicode_2BYTE_KIND = 2, PyUnicode_4BYTE_KIND = 4 |