Mark PyUnicode_FromUCS[124] as private
diff --git a/Objects/stringlib/ucs1lib.h b/Objects/stringlib/ucs1lib.h
index 4685c17..c0f7adf 100644
--- a/Objects/stringlib/ucs1lib.h
+++ b/Objects/stringlib/ucs1lib.h
@@ -19,7 +19,7 @@
#define STRINGLIB_FILL Py_UNICODE_FILL
#define STRINGLIB_STR PyUnicode_1BYTE_DATA
#define STRINGLIB_LEN PyUnicode_GET_LENGTH
-#define STRINGLIB_NEW PyUnicode_FromUCS1
+#define STRINGLIB_NEW _PyUnicode_FromUCS1
#define STRINGLIB_RESIZE not_supported
#define STRINGLIB_CHECK PyUnicode_Check
#define STRINGLIB_CHECK_EXACT PyUnicode_CheckExact
diff --git a/Objects/stringlib/ucs2lib.h b/Objects/stringlib/ucs2lib.h
index 1bb9c27..fc62fb7 100644
--- a/Objects/stringlib/ucs2lib.h
+++ b/Objects/stringlib/ucs2lib.h
@@ -19,7 +19,7 @@
#define STRINGLIB_FILL Py_UNICODE_FILL
#define STRINGLIB_STR PyUnicode_1BYTE_DATA
#define STRINGLIB_LEN PyUnicode_GET_LENGTH
-#define STRINGLIB_NEW PyUnicode_FromUCS2
+#define STRINGLIB_NEW _PyUnicode_FromUCS2
#define STRINGLIB_RESIZE not_supported
#define STRINGLIB_CHECK PyUnicode_Check
#define STRINGLIB_CHECK_EXACT PyUnicode_CheckExact
diff --git a/Objects/stringlib/ucs4lib.h b/Objects/stringlib/ucs4lib.h
index 776d65f..be1206a 100644
--- a/Objects/stringlib/ucs4lib.h
+++ b/Objects/stringlib/ucs4lib.h
@@ -19,7 +19,7 @@
#define STRINGLIB_FILL Py_UNICODE_FILL
#define STRINGLIB_STR PyUnicode_1BYTE_DATA
#define STRINGLIB_LEN PyUnicode_GET_LENGTH
-#define STRINGLIB_NEW PyUnicode_FromUCS4
+#define STRINGLIB_NEW _PyUnicode_FromUCS4
#define STRINGLIB_RESIZE not_supported
#define STRINGLIB_CHECK PyUnicode_Check
#define STRINGLIB_CHECK_EXACT PyUnicode_CheckExact
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index b53c210..68977f4 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -1117,8 +1117,8 @@
return PyUnicode_FromStringAndSize(u, size);
}
-PyObject*
-PyUnicode_FromUCS1(const unsigned char* u, Py_ssize_t size)
+static PyObject*
+_PyUnicode_FromUCS1(const unsigned char* u, Py_ssize_t size)
{
PyObject *res;
unsigned char max = 127;
@@ -1136,8 +1136,8 @@
return res;
}
-PyObject*
-PyUnicode_FromUCS2(const Py_UCS2 *u, Py_ssize_t size)
+static PyObject*
+_PyUnicode_FromUCS2(const Py_UCS2 *u, Py_ssize_t size)
{
PyObject *res;
Py_UCS2 max = 0;
@@ -1156,8 +1156,8 @@
return res;
}
-PyObject*
-PyUnicode_FromUCS4(const Py_UCS4 *u, Py_ssize_t size)
+static PyObject*
+_PyUnicode_FromUCS4(const Py_UCS4 *u, Py_ssize_t size)
{
PyObject *res;
Py_UCS4 max = 0;
@@ -1184,11 +1184,11 @@
{
switch(kind) {
case PyUnicode_1BYTE_KIND:
- return PyUnicode_FromUCS1(buffer, size);
+ return _PyUnicode_FromUCS1(buffer, size);
case PyUnicode_2BYTE_KIND:
- return PyUnicode_FromUCS2(buffer, size);
+ return _PyUnicode_FromUCS2(buffer, size);
case PyUnicode_4BYTE_KIND:
- return PyUnicode_FromUCS4(buffer, size);
+ return _PyUnicode_FromUCS4(buffer, size);
}
assert(0);
return NULL;
@@ -5645,7 +5645,7 @@
const char *errors)
{
/* Latin-1 is equivalent to the first 256 ordinals in Unicode. */
- return PyUnicode_FromUCS1((unsigned char*)s, size);
+ return _PyUnicode_FromUCS1((unsigned char*)s, size);
}
/* create or adjust a UnicodeEncodeError */