From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Tue, 11 Oct 2011 22:14:32 +0000 (+0200)
Subject: stringlib: Fix STRINGLIB_STR for UCS2/UCS4
X-Git-Tag: v3.3.0a1~1211
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d218bf14ccf60f659180229b625c16d2caf2a7c5;p=thirdparty%2FPython%2Fcpython.git

stringlib: Fix STRINGLIB_STR for UCS2/UCS4
---

diff --git a/Objects/stringlib/ucs2lib.h b/Objects/stringlib/ucs2lib.h
index 18117ef5e652..e2e8c1be0fe9 100644
--- a/Objects/stringlib/ucs2lib.h
+++ b/Objects/stringlib/ucs2lib.h
@@ -18,7 +18,7 @@
 #define STRINGLIB_TOUPPER        Py_UNICODE_TOUPPER
 #define STRINGLIB_TOLOWER        Py_UNICODE_TOLOWER
 #define STRINGLIB_FILL           Py_UNICODE_FILL
-#define STRINGLIB_STR            PyUnicode_1BYTE_DATA
+#define STRINGLIB_STR            PyUnicode_2BYTE_DATA
 #define STRINGLIB_LEN            PyUnicode_GET_LENGTH
 #define STRINGLIB_NEW            _PyUnicode_FromUCS2
 #define STRINGLIB_RESIZE         not_supported
diff --git a/Objects/stringlib/ucs4lib.h b/Objects/stringlib/ucs4lib.h
index 988ddc08d8f5..0ca866047677 100644
--- a/Objects/stringlib/ucs4lib.h
+++ b/Objects/stringlib/ucs4lib.h
@@ -18,7 +18,7 @@
 #define STRINGLIB_TOUPPER        Py_UNICODE_TOUPPER
 #define STRINGLIB_TOLOWER        Py_UNICODE_TOLOWER
 #define STRINGLIB_FILL           Py_UNICODE_FILL
-#define STRINGLIB_STR            PyUnicode_1BYTE_DATA
+#define STRINGLIB_STR            PyUnicode_4BYTE_DATA
 #define STRINGLIB_LEN            PyUnicode_GET_LENGTH
 #define STRINGLIB_NEW            _PyUnicode_FromUCS4
 #define STRINGLIB_RESIZE         not_supported