Skip to content

Commit

Permalink
Merge pull request numpy#3936 from charris/forward-port-3935
Browse files Browse the repository at this point in the history
forward-port-3935
  • Loading branch information
charris committed Oct 17, 2013
2 parents af2b52e + 876f416 commit ac63298
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions numpy/core/src/multiarray/mapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit ac63298

Please sign in to comment.