diff options
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/umath/ufunc_object.c | 20 | ||||
| -rw-r--r-- | numpy/lib/src/_compiled_base.c | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/numpy/core/src/umath/ufunc_object.c b/numpy/core/src/umath/ufunc_object.c index 42f45218f..7e8556ee7 100644 --- a/numpy/core/src/umath/ufunc_object.c +++ b/numpy/core/src/umath/ufunc_object.c @@ -36,7 +36,7 @@ #include "numpy/npy_3kcompat.h" -#include "numpy/noprefix.h" +#include "numpy/ndarrayobject.h" #include "numpy/ufuncobject.h" #include "lowlevel_strided_loops.h" #include "ufunc_type_resolution.h" @@ -377,8 +377,8 @@ _extract_pyvals(PyObject *ref, char *name, int *bufsize, *errobj = NULL; if (!PyList_Check(ref) || (PyList_GET_SIZE(ref)!=3)) { - PyErr_Format(PyExc_TypeError, "%s must be a length 3 list.", - UFUNC_PYVALS_NAME); + PyErr_Format(PyExc_TypeError, + "%s must be a length 3 list.", UFUNC_PYVALS_NAME); return -1; } @@ -386,14 +386,14 @@ _extract_pyvals(PyObject *ref, char *name, int *bufsize, if ((*bufsize == -1) && PyErr_Occurred()) { return -1; } - if ((*bufsize < NPY_MIN_BUFSIZE) - || (*bufsize > NPY_MAX_BUFSIZE) - || (*bufsize % 16 != 0)) { + if ((*bufsize < NPY_MIN_BUFSIZE) || + (*bufsize > NPY_MAX_BUFSIZE) || + (*bufsize % 16 != 0)) { PyErr_Format(PyExc_ValueError, - "buffer size (%d) is not in range " - "(%"INTP_FMT" - %"INTP_FMT") or not a multiple of 16", - *bufsize, (npy_intp) NPY_MIN_BUFSIZE, - (npy_intp) NPY_MAX_BUFSIZE); + "buffer size (%d) is not in range " + "(%"NPY_INTP_FMT" - %"NPY_INTP_FMT") or not a multiple of 16", + *bufsize, (npy_intp) NPY_MIN_BUFSIZE, + (npy_intp) NPY_MAX_BUFSIZE); return -1; } diff --git a/numpy/lib/src/_compiled_base.c b/numpy/lib/src/_compiled_base.c index 20f8e02fa..137c47515 100644 --- a/numpy/lib/src/_compiled_base.c +++ b/numpy/lib/src/_compiled_base.c @@ -1,7 +1,7 @@ #define NPY_NO_DEPRECATED_API #include "Python.h" #include "structmember.h" -#include "numpy/noprefix.h" +#include "numpy/ndarrayobject.h" #include "numpy/npy_3kcompat.h" #include "npy_config.h" #include "numpy/ufuncobject.h" |