diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-07-08 00:24:12 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-07-08 00:24:12 +0000 |
| commit | 1acf453e6bdbac5e176806b0ad07ad33e32a5f40 (patch) | |
| tree | 87a5ee0373b5ac70c33df30ba84ee9dff5035667 /numpy/lib/src/_compiled_base.c | |
| parent | 8904c7ab8d3e5fb1233e80586c5a4c6b7df4a14b (diff) | |
| download | numpy-1acf453e6bdbac5e176806b0ad07ad33e32a5f40.tar.gz | |
Apply npy_ and NPY_ prefixes to all C-API names that don't already have PyArray_ prefixes.
Diffstat (limited to 'numpy/lib/src/_compiled_base.c')
| -rw-r--r-- | numpy/lib/src/_compiled_base.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/numpy/lib/src/_compiled_base.c b/numpy/lib/src/_compiled_base.c index 1ba1aa742..bd107ee52 100644 --- a/numpy/lib/src/_compiled_base.c +++ b/numpy/lib/src/_compiled_base.c @@ -1,6 +1,6 @@ #include "Python.h" #include "structmember.h" -#include "numpy/arrayobject.h" +#include "numpy/noprefix.h" static PyObject *ErrorObject; #define Py_Try(BOOLEAN) {if (!(BOOLEAN)) goto fail;} @@ -165,9 +165,9 @@ arr_digitize(PyObject *self, PyObject *args, PyObject *kwds) &ox, &obins)); type = PyArray_DescrFromType(PyArray_DOUBLE); - Py_Try(ax=PyArray_FromAny(ox, type, 1, 1, CARRAY_FLAGS, NULL)); + Py_Try(ax=PyArray_FromAny(ox, type, 1, 1, CARRAY, NULL)); Py_INCREF(type); - Py_Try(abins = PyArray_FromAny(obins, type, 1, 1, CARRAY_FLAGS, NULL)); + Py_Try(abins = PyArray_FromAny(obins, type, 1, 1, CARRAY, NULL)); lx = PyArray_SIZE(ax); dx = (double *)PyArray_DATA(ax); @@ -236,7 +236,7 @@ arr_insert(PyObject *self, PyObject *args, PyObject *kwdict) &mask, &vals)) goto fail; - amask = (PyArrayObject *) PyArray_FROM_OF(mask, CARRAY_FLAGS); + amask = (PyArrayObject *) PyArray_FROM_OF(mask, CARRAY); if (amask == NULL) goto fail; /* Cast an object array */ if (amask->descr->type_num == PyArray_OBJECT) { |