diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2012-02-09 17:27:34 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2012-02-09 17:27:34 -0700 |
| commit | ca258fc430fbcba6a3824dd3834f8e14259a62c8 (patch) | |
| tree | 7bce260afd14ab3bfcffc140c3d56159e3777e84 /numpy/lib | |
| parent | 096b436e6e93d09057eb415e76b1f452170db3e6 (diff) | |
| parent | 87214fbfb095664e70702da421bc0df4cddd26c5 (diff) | |
| download | numpy-ca258fc430fbcba6a3824dd3834f8e14259a62c8.tar.gz | |
Merge branch 'replace-noprefix'
* replace-noprefix: (30 commits)
BUG: Fix typo npydouble.
UPD: Remove now redundant typedef.
UPD: Fix a few more spots missing prefixes.
BUG: Fix scons build script so it works with umathmodule.c.
STY: Cleanup some prefixing that crept into comments.
UPD: Various fixes, Remove #define NPY_NO_PREFIX from files in core.
ENH: Add some needed macros to include files.
UPD: Use prefixed types in scalartypes.c.src.
UPD: Make multiarray *.c files use prefixed macros.
UPD: Use prefixed types in arraytypes.c.src.
ENH: Add a few needed macros to npy_common.h.
UPD: Include ndarrayobject.h instead of arrayobject.h in boolean_ops.c.src.
UPD: Use prefixed types in lowlevel_strided_loops.c.src template headers.
UPD: Use explicit prefixed types in einsum.c.src template headers.
UPD: Use prefixed versions of double and int in multiarray_tests.c.src.
UPD: Remove includes of noprefix.h in ufunc_object.c and _compiled_base.c.
BUG: Fix unprefixed reference to cdouble in ndarrayobject.h.
UPD: Use prefixed macros in numpy/core/src/scalarmathmodule.c.src.
UPD: Use prefixed macros in numpy/core/src/umath/funcs.inc.src.
MOV: Rename umathmodule.c.src umathmodule.c since it has no templates.
...
Diffstat (limited to 'numpy/lib')
| -rw-r--r-- | numpy/lib/src/_compiled_base.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/lib/src/_compiled_base.c b/numpy/lib/src/_compiled_base.c index 536b048f5..82343fc35 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/arrayobject.h" #include "numpy/npy_3kcompat.h" #include "npy_config.h" #include "numpy/ufuncobject.h" @@ -1378,7 +1378,7 @@ pack_or_unpack_bits(PyObject *input, int axis, int unpack) PyArrayObject *inp; PyArrayObject *new = NULL; PyArrayObject *out = NULL; - npy_intp outdims[MAX_DIMS]; + npy_intp outdims[NPY_MAXDIMS]; int i; void (*thefunc)(void *, int, npy_intp, npy_intp, void *, npy_intp, npy_intp); PyArrayIterObject *it, *ot; |