From 52e2cc8604fef89bf3dff8eed37af68df7e813ea Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 19 Dec 2011 22:14:45 +0100 Subject: [PATCH] backout 7876cd49300d: Move PyUnicode_WCHAR_KIND outside PyUnicode_Kind enum --- Include/unicodeobject.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h index 60bfcbe5ca9..c5480f1b46f 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