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

victor.stinner python-checkins at python.org
Sat Dec 17 22:38:27 CET 2011


http://hg.python.org/cpython/rev/7876cd49300d
changeset:   74014:7876cd49300d
parent:      74012:59ea1d1a4137
user:        Victor Stinner <victor.stinner at haypocalc.com>
date:        Sat Dec 17 22:18:27 2011 +0100
summary:
  Move PyUnicode_WCHAR_KIND outside PyUnicode_Kind enum

files:
  Include/unicodeobject.h |  7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -445,12 +445,13 @@
 #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

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list