summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-12-17 21:18:27 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-12-17 21:18:27 (GMT)
commit0ba5af20c049bc4c38002c108a1838f27cd793d8 (patch)
tree5a7876506779c45a14d8855270c7f55183d19334
parent564a42c8decbfe5a18a5ff0b6c496a41740c5a0f (diff)
downloadcpython-0ba5af20c049bc4c38002c108a1838f27cd793d8.zip
cpython-0ba5af20c049bc4c38002c108a1838f27cd793d8.tar.gz
cpython-0ba5af20c049bc4c38002c108a1838f27cd793d8.tar.bz2
Move PyUnicode_WCHAR_KIND outside PyUnicode_Kind enum
-rw-r--r--Include/unicodeobject.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
index c5480f1..60bfcbe 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