diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2013-10-17 12:45:49 -0700 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2013-10-17 12:45:49 -0700 |
commit | ac6329832d23e7788ad160d88d8af6a1a1d93da3 (patch) | |
tree | ea02c6d4e93a7e77fb8c7abf6ae546cfbdf2653a | |
parent | af2b52ec162395e5ca034933ec621868bcaf9bc1 (diff) | |
parent | 876f416ef43f37b13615adfadcdeca39551bdb58 (diff) | |
download | numpy-ac6329832d23e7788ad160d88d8af6a1a1d93da3.tar.gz |
Merge pull request #3936 from charris/forward-port-3935
forward-port-3935
-rw-r--r-- | numpy/core/src/multiarray/mapping.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/numpy/core/src/multiarray/mapping.h b/numpy/core/src/multiarray/mapping.h index ff11fbca3..224e28412 100644 --- a/numpy/core/src/multiarray/mapping.h +++ b/numpy/core/src/multiarray/mapping.h @@ -26,16 +26,7 @@ NPY_NO_EXPORT PyObject * array_subscript(PyArrayObject *self, PyObject *op); NPY_NO_EXPORT int -array_ass_big_item(PyArrayObject *self, npy_intp i, PyObject *v); - -/* SIZEOF_SIZE_T is nowhere defined, Py_ssize_t perhaps?*/ -#if SIZEOF_SIZE_T == NPY_SIZEOF_INTP -#define array_ass_item array_ass_big_item -#else -NPY_NO_EXPORT int -_array_ass_item(PyArrayObject *self, Py_ssize_t i, PyObject *v); -#define array_ass_item _array_ass_item -#endif +array_ass_item(PyArrayObject *self, Py_ssize_t i, PyObject *v); NPY_NO_EXPORT PyObject * add_new_axes_0d(PyArrayObject *, int); |