Merge pull request #121 from mdboom/PyArray_DATA-cast

mwiebe · mwiebe · commit d5b29c40c3d2 · 2011-07-27T09:55:02.000-07:00
Fix PyArray_BYTES return type.
diff --git a/numpy/core/include/numpy/ndarraytypes.h b/numpy/core/include/numpy/ndarraytypes.h
@@ -1377,10 +1377,14 @@ PyArray_SETITEM(PyArrayObject *arr, char *itemptr, PyObject *v)
                                                 arr);
 }
 
+/* Same as PyArray_DATA */
+#define PyArray_BYTES(arr) PyArray_DATA(arr)
+
 #else
 
 /* Macros are deprecated as of NumPy 1.7. */
 #define PyArray_NDIM(obj) (((PyArrayObject_fieldaccess *)(obj))->nd)
+#define PyArray_BYTES(obj) ((char *)(((PyArrayObject_fieldaccess *)(obj))->data))
 #define PyArray_DATA(obj) ((void *)(((PyArrayObject_fieldaccess *)(obj))->data))
 #define PyArray_DIMS(obj) (((PyArrayObject_fieldaccess *)(obj))->dimensions)
 #define PyArray_STRIDES(obj) (((PyArrayObject_fieldaccess *)(obj))->strides)
@@ -1405,9 +1409,6 @@ PyArray_SETITEM(PyArrayObject *arr, char *itemptr, PyObject *v)
                                      (PyArrayObject *)(obj))
 #endif
 
-/* Same as PyArray_DATA */
-#define PyArray_BYTES(arr) PyArray_DATA(arr)
-
 /*
  * Enables the specified array flags. Does no checking,
  * assumes you know what you're doing.
