Remove unicodeobject.h from the build.

It does almost nothing when Py_USING_UNICODE is not defined.
oilshell · Aug 19, 2018 · 312b54282c3005be077d9300ed90f4e20aabf1f0 · 312b542
1 parent f1f4903
commit 312b54282c3005be077d9300ed90f4e20aabf1f0
Unified Split

Showing with 9 additions and 0 deletions.

+5 −0 Python-2.7.13/Include/Python.h

+4 −0 Python-2.7.13/Objects/stringobject.c
diff --git a/Python-2.7.13/Include/Python.h b/Python-2.7.13/Include/Python.h
@@ -82,7 +82,12 @@

 #include "pydebug.h"

+#ifdef OVM_MAIN
+#define PyUnicode_Check(op)                 0
+#else
 #include "unicodeobject.h"
+#endif
+
 #include "intobject.h"
 #include "boolobject.h"
 #include "longobject.h"
diff --git a/Python-2.7.13/Objects/stringobject.c b/Python-2.7.13/Objects/stringobject.c
@@ -1609,7 +1609,11 @@ string_join(PyStringObject *self, PyObject *orig)
    }
    if (seqlen == 1) {
        item = PySequence_Fast_GET_ITEM(seq, 0);
+#ifdef OVM_MAIN
+        if (PyString_CheckExact(item)) {
+#else
        if (PyString_CheckExact(item) || PyUnicode_CheckExact(item)) {
+#endif
            Py_INCREF(item);
            Py_DECREF(seq);
            return item;