mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

backout 7876cd49300d: Move PyUnicode_WCHAR_KIND outside PyUnicode_Kind enum

Browse source
This commit is contained in:
Victor Stinner 2011-12-19 22:14:45 +01:00
parent 2fa22818bd
commit 52e2cc8604
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Include/unicodeobject.h
View file

@ -445,13 +445,12 @@ 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. */
#define PyUnicode_WCHAR_KIND 0 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