[Python-checkins] cpython: backout 7876cd49300d: Move PyUnicode_WCHAR_KIND outside PyUnicode_Kind enum

Mon Dec 19 22:13:59 CET 2011

http://hg.python.org/cpython/rev/d2df3396fef0
changeset: 74087:d2df3396fef0
user: Victor Stinner <victor.stinner at haypocalc.com>
date: Mon Dec 19 22:14:45 2011 +0100
summary:
 backout 7876cd49300d: Move PyUnicode_WCHAR_KIND outside PyUnicode_Kind enum
files:
 Include/unicodeobject.h | 7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -445,13 +445,12 @@
 #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
-- 
Repository URL: http://hg.python.org/cpython
