Commit 5ca88d2b authored by Benjamin Peterson's avatar Benjamin Peterson

get the core to compile --disable-unicode

parent 14224420
...@@ -15,7 +15,11 @@ ...@@ -15,7 +15,11 @@
/* size of a code word (must be unsigned short or larger, and /* size of a code word (must be unsigned short or larger, and
large enough to hold a UCS4 character) */ large enough to hold a UCS4 character) */
#ifdef Py_USING_UNICODE
#define SRE_CODE Py_UCS4 #define SRE_CODE Py_UCS4
#else
#define SRE_CODE unsigned long
#endif
typedef struct { typedef struct {
PyObject_VAR_HEAD PyObject_VAR_HEAD
......
...@@ -1816,7 +1816,6 @@ file_write(PyFileObject *f, PyObject *args) ...@@ -1816,7 +1816,6 @@ file_write(PyFileObject *f, PyObject *args)
n = pbuf.len; n = pbuf.len;
} }
else { else {
const char *encoding, *errors;
PyObject *text; PyObject *text;
if (!PyArg_ParseTuple(args, "O", &text)) if (!PyArg_ParseTuple(args, "O", &text))
return NULL; return NULL;
...@@ -1824,7 +1823,9 @@ file_write(PyFileObject *f, PyObject *args) ...@@ -1824,7 +1823,9 @@ file_write(PyFileObject *f, PyObject *args)
if (PyString_Check(text)) { if (PyString_Check(text)) {
s = PyString_AS_STRING(text); s = PyString_AS_STRING(text);
n = PyString_GET_SIZE(text); n = PyString_GET_SIZE(text);
#ifdef Py_USING_UNICODE
} else if (PyUnicode_Check(text)) { } else if (PyUnicode_Check(text)) {
const char *encoding, *errors;
if (f->f_encoding != Py_None) if (f->f_encoding != Py_None)
encoding = PyString_AS_STRING(f->f_encoding); encoding = PyString_AS_STRING(f->f_encoding);
else else
...@@ -1838,6 +1839,7 @@ file_write(PyFileObject *f, PyObject *args) ...@@ -1838,6 +1839,7 @@ file_write(PyFileObject *f, PyObject *args)
return NULL; return NULL;
s = PyString_AS_STRING(encoded); s = PyString_AS_STRING(encoded);
n = PyString_GET_SIZE(encoded); n = PyString_GET_SIZE(encoded);
#endif
} else { } else {
if (PyObject_AsCharBuffer(text, &s, &n)) if (PyObject_AsCharBuffer(text, &s, &n))
return NULL; return NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment