Move PyUnicode_WCHAR_KIND outside PyUnicode_Kind enum

This commit is contained in:
Victor Stinner 2011-12-17 22:18:27 +01:00
parent 564a42c8de
commit 0ba5af20c0

View file

@ -445,12 +445,13 @@ PyAPI_DATA(PyTypeObject) PyUnicodeIter_Type;
#define PyUnicode_IS_COMPACT_ASCII(op) \ #define PyUnicode_IS_COMPACT_ASCII(op) \
(((PyASCIIObject*)op)->state.ascii && PyUnicode_IS_COMPACT(op)) (((PyASCIIObject*)op)->state.ascii && PyUnicode_IS_COMPACT(op))
enum PyUnicode_Kind {
/* String contains only wstr byte characters. This is only possible /* String contains only wstr byte characters. This is only possible
when the string was created with a legacy API and _PyUnicode_Ready() when the string was created with a legacy API and _PyUnicode_Ready()
has not been called yet. */ has not been called yet. */
PyUnicode_WCHAR_KIND = 0, #define PyUnicode_WCHAR_KIND 0
/* Return values of the PyUnicode_KIND() macro: */
/* Return values of the PyUnicode_KIND() macro */
enum PyUnicode_Kind {
PyUnicode_1BYTE_KIND = 1, PyUnicode_1BYTE_KIND = 1,
PyUnicode_2BYTE_KIND = 2, PyUnicode_2BYTE_KIND = 2,
PyUnicode_4BYTE_KIND = 4 PyUnicode_4BYTE_KIND = 4