diff options
| -rw-r--r-- | numpy/core/src/arraytypes.inc.src | 2 | ||||
| -rw-r--r-- | numpy/core/src/scalartypes.inc.src | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/numpy/core/src/arraytypes.inc.src b/numpy/core/src/arraytypes.inc.src index 468728154..0fd105ab1 100644 --- a/numpy/core/src/arraytypes.inc.src +++ b/numpy/core/src/arraytypes.inc.src @@ -238,7 +238,7 @@ UNICODE_getitem(char *ip, PyArrayObject *ap) } else buffer = ip; #ifdef Py_UNICODE_WIDE - obj = PyUnicode_FromUnicode((const PyArray_UCS4 *)buffer, mysize); + obj = PyUnicode_FromUnicode((const Py_UNICODE *)buffer, mysize); #else /* create new empty unicode object of length mysize*2 */ obj = MyPyUnicode_New(mysize*2); diff --git a/numpy/core/src/scalartypes.inc.src b/numpy/core/src/scalartypes.inc.src index 2f48ff041..9926cd83c 100644 --- a/numpy/core/src/scalartypes.inc.src +++ b/numpy/core/src/scalartypes.inc.src @@ -205,8 +205,9 @@ PyArray_FromScalar(PyObject *scalar, PyArray_Descr *outcode) if (PyArray_ISOBJECT(r)) { Py_INCREF(*((PyObject **)memptr)); } - +#ifndef Py_UNICODE_WIDE finish: +#endif if (outcode == NULL) return r; if (outcode->type_num == typecode->type_num) { |