From: Victor Stinner Date: Sat, 17 Dec 2011 21:18:27 +0000 (+0100) Subject: Move PyUnicode_WCHAR_KIND outside PyUnicode_Kind enum X-Git-Tag: v3.3.0a1~585 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ba5af20c049bc4c38002c108a1838f27cd793d8;p=python Move PyUnicode_WCHAR_KIND outside PyUnicode_Kind enum --- diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h index c5480f1b46..60bfcbe5ca 100644 --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -445,12 +445,13 @@ 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. */ - PyUnicode_WCHAR_KIND = 0, -/* Return values of the PyUnicode_KIND() macro: */ +#define PyUnicode_WCHAR_KIND 0 + +/* Return values of the PyUnicode_KIND() macro */ +enum PyUnicode_Kind { PyUnicode_1BYTE_KIND = 1, PyUnicode_2BYTE_KIND = 2, PyUnicode_4BYTE_KIND = 4