diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-04-30 08:51:38 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-04-30 08:51:38 +0000 |
| commit | 9d309955e758e6d699565e09a697535a5237431c (patch) | |
| tree | 57118f34c04d9d00dfe6a820fc0a0dbcd369f586 /numpy | |
| parent | 719164150c82915955cddd0309577bd156da099e (diff) | |
| download | numpy-9d309955e758e6d699565e09a697535a5237431c.tar.gz | |
Fix ucsnarrow conditional compilation.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/multiarray/arrayobject.c | 7 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/common.h | 4 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/scalarapi.c | 3 |
3 files changed, 4 insertions, 10 deletions
diff --git a/numpy/core/src/multiarray/arrayobject.c b/numpy/core/src/multiarray/arrayobject.c index f9ad9e073..2da591003 100644 --- a/numpy/core/src/multiarray/arrayobject.c +++ b/numpy/core/src/multiarray/arrayobject.c @@ -258,13 +258,6 @@ PyArray_XDECREF(PyArrayObject *mp) return 0; } -/* - * FIXME -#ifndef Py_UNICODE_WIDE -#include "ucsnarrow.c" -#endif - */ - /* Helper functions */ /*NUMPY_API*/ diff --git a/numpy/core/src/multiarray/common.h b/numpy/core/src/multiarray/common.h index a65683f72..67ee9b66f 100644 --- a/numpy/core/src/multiarray/common.h +++ b/numpy/core/src/multiarray/common.h @@ -27,4 +27,8 @@ _IsAligned(PyArrayObject *ap); NPY_NO_EXPORT Bool _IsWriteable(PyArrayObject *ap); +#ifndef Py_UNICODE_WIDE +#include "ucsnarrow.h" +#endif + #endif diff --git a/numpy/core/src/multiarray/scalarapi.c b/numpy/core/src/multiarray/scalarapi.c index 30a7f2b55..1c8edff5c 100644 --- a/numpy/core/src/multiarray/scalarapi.c +++ b/numpy/core/src/multiarray/scalarapi.c @@ -13,9 +13,6 @@ #include "descriptor.h" #include "scalartypes.h" -#ifndef Py_UNICODE_WIDE -#include "ucsnarrow.h" -#endif static PyArray_Descr * _descr_from_subtype(PyObject *type) |