UPD: Use prefixed macros in *.h files except in numpy/numarray.

5 files changed, 22 insertions, 22 deletions

diff --git a/numpy/core/src/multiarray/conversion_utils.h b/numpy/core/src/multiarray/conversion_utils.h
index e344a19b0..b275f49b1 100644
--- a/numpy/core/src/multiarray/conversion_utils.h
+++ b/numpy/core/src/multiarray/conversion_utils.h
@@ -8,7 +8,7 @@ NPY_NO_EXPORT int
 PyArray_BufferConverter(PyObject *obj, PyArray_Chunk *buf);
 
 NPY_NO_EXPORT int
-PyArray_BoolConverter(PyObject *object, Bool *val);
+PyArray_BoolConverter(PyObject *object, npy_bool *val);
 
 NPY_NO_EXPORT int
 PyArray_ByteorderConverter(PyObject *obj, char *endian);
@@ -22,17 +22,17 @@ PyArray_SearchsideConverter(PyObject *obj, void *addr);
 NPY_NO_EXPORT int
 PyArray_PyIntAsInt(PyObject *o);
 
-NPY_NO_EXPORT intp
+NPY_NO_EXPORT npy_intp
 PyArray_PyIntAsIntp(PyObject *o);
 
 NPY_NO_EXPORT int
-PyArray_IntpFromSequence(PyObject *seq, intp *vals, int maxvals);
+PyArray_IntpFromSequence(PyObject *seq, npy_intp *vals, int maxvals);
 
 NPY_NO_EXPORT int
 PyArray_TypestrConvert(int itemsize, int gentype);
 
 NPY_NO_EXPORT PyObject *
-PyArray_IntTupleFromIntp(int len, intp *vals);
+PyArray_IntTupleFromIntp(int len, npy_intp *vals);
 
 /*
  * Converts an axis parameter into an ndim-length C-array of
diff --git a/numpy/core/src/multiarray/ctors.h b/numpy/core/src/multiarray/ctors.h
index e12d153ca..116435d9a 100644
--- a/numpy/core/src/multiarray/ctors.h
+++ b/numpy/core/src/multiarray/ctors.h
@@ -3,11 +3,11 @@
 
 NPY_NO_EXPORT PyObject *
 PyArray_NewFromDescr(PyTypeObject *subtype, PyArray_Descr *descr, int nd,
-                     intp *dims, intp *strides, void *data,
+                     npy_intp *dims, npy_intp *strides, void *data,
                      int flags, PyObject *obj);
 
-NPY_NO_EXPORT PyObject *PyArray_New(PyTypeObject *, int nd, intp *,
-                             int, intp *, void *, int, int, PyObject *);
+NPY_NO_EXPORT PyObject *PyArray_New(PyTypeObject *, int nd, npy_intp *,
+                             int, npy_intp *, void *, int, int, PyObject *);
 
 NPY_NO_EXPORT PyObject *
 PyArray_FromAny(PyObject *op, PyArray_Descr *newtype, int min_depth,
@@ -52,22 +52,22 @@ PyArray_CopyAsFlat(PyArrayObject *dst, PyArrayObject *src,
 
 /* FIXME: remove those from here */
 NPY_NO_EXPORT size_t
-_array_fill_strides(intp *strides, intp *dims, int nd, size_t itemsize,
+_array_fill_strides(npy_intp *strides, npy_intp *dims, int nd, size_t itemsize,
                     int inflag, int *objflags);
 
 NPY_NO_EXPORT void
-_unaligned_strided_byte_copy(char *dst, intp outstrides, char *src,
-                             intp instrides, intp N, int elsize);
+_unaligned_strided_byte_copy(char *dst, npy_intp outstrides, char *src,
+                             npy_intp instrides, npy_intp N, int elsize);
 
 NPY_NO_EXPORT void
-_strided_byte_swap(void *p, intp stride, intp n, int size);
+_strided_byte_swap(void *p, npy_intp stride, npy_intp n, int size);
 
 NPY_NO_EXPORT void
-copy_and_swap(void *dst, void *src, int itemsize, intp numitems,
-              intp srcstrides, int swap);
+copy_and_swap(void *dst, void *src, int itemsize, npy_intp numitems,
+              npy_intp srcstrides, int swap);
 
 NPY_NO_EXPORT void
-byte_swap_vector(void *p, intp n, int size);
+byte_swap_vector(void *p, npy_intp n, int size);
 
 NPY_NO_EXPORT int
 PyArray_AssignFromSequence(PyArrayObject *self, PyObject *v);
diff --git a/numpy/core/src/multiarray/iterators.h b/numpy/core/src/multiarray/iterators.h
index e877f8520..6d648810e 100644
--- a/numpy/core/src/multiarray/iterators.h
+++ b/numpy/core/src/multiarray/iterators.h
@@ -22,8 +22,8 @@ NPY_NO_EXPORT int
 iter_ass_subscript(PyArrayIterObject *, PyObject *, PyObject *);
 
 NPY_NO_EXPORT int
-slice_GetIndices(PySliceObject *r, intp length,
-                 intp *start, intp *stop, intp *step,
-                 intp *slicelength);
+slice_GetIndices(PySliceObject *r, npy_intp length,
+                 npy_intp *start, npy_intp *stop, npy_intp *step,
+                 npy_intp *slicelength);
 
 #endif
diff --git a/numpy/core/src/multiarray/mapping.h b/numpy/core/src/multiarray/mapping.h
index d5ac74735..d4da61b0c 100644
--- a/numpy/core/src/multiarray/mapping.h
+++ b/numpy/core/src/multiarray/mapping.h
@@ -8,7 +8,7 @@ NPY_NO_EXPORT PyMappingMethods array_as_mapping;
 #endif
 
 NPY_NO_EXPORT PyObject *
-array_big_item(PyArrayObject *self, intp i);
+array_big_item(PyArrayObject *self, npy_intp i);
 
 NPY_NO_EXPORT Py_ssize_t
 array_length(PyArrayObject *self);
@@ -20,14 +20,14 @@ NPY_NO_EXPORT PyObject *
 array_subscript(PyArrayObject *self, PyObject *op);
 
 NPY_NO_EXPORT int
-array_ass_big_item(PyArrayObject *self, intp i, PyObject *v);
+array_ass_big_item(PyArrayObject *self, npy_intp i, PyObject *v);
 
 #if PY_VERSION_HEX < 0x02050000
-        #if SIZEOF_INT == SIZEOF_INTP
+        #if SIZEOF_INT == NPY_SIZEOF_INTP
                 #define array_ass_item array_ass_big_item
         #endif
 #else
-        #if SIZEOF_SIZE_T == SIZEOF_INTP
+        #if SIZEOF_SIZE_T == NPY_SIZEOF_INTP
                 #define array_ass_item array_ass_big_item
         #endif
 #endif
diff --git a/numpy/core/src/multiarray/scalartypes.h b/numpy/core/src/multiarray/scalartypes.h
index 7397a97e0..29fbb9e5e 100644
--- a/numpy/core/src/multiarray/scalartypes.h
+++ b/numpy/core/src/multiarray/scalartypes.h
@@ -33,7 +33,7 @@ NPY_NO_EXPORT void
 initialize_numeric_types(void);
 
 NPY_NO_EXPORT void
-format_longdouble(char *buf, size_t buflen, longdouble val, unsigned int prec);
+format_longdouble(char *buf, size_t buflen, npy_longdouble val, unsigned int prec);
 
 #if PY_VERSION_HEX >= 0x03000000
 NPY_NO_EXPORT void