Merge branch 'replace-old-defines'

* replace-old-defines:
  DOC: clarify numpy version for removal, document sed script better.
  STY: Fix up the 2.0 (1.7) release notes.
  DEP: Deprecate the old_defines.h header and the macros therein.
  UPDATE: Replace macros in old_defines.h by new.
  DOC: numpybook - Replace macro names in old_defines.h with new.
  DOC: Replace references to macros in old_defines with new.
  STY: Replace more found macros in old_defines.h with new.
  ENH: Add sed script that replaces macros in old_defines.h.
  STY: f2py - replace macros in old_defines.h with new.
  STY: linalg - replace macros in old_defines.h with new.
  STY: fft - replace macros in old_defines.h with new.
  STY: lib/src - replace macros in old_defines.h with new.
  STY: core/src - replace macros in old_defines.h with new versions.

1 files changed, 2 insertions, 2 deletions

diff --git a/numpy/lib/src/_compiled_base.c b/numpy/lib/src/_compiled_base.c
index e4513d512..536b048f5 100644
--- a/numpy/lib/src/_compiled_base.c
+++ b/numpy/lib/src/_compiled_base.c
@@ -754,7 +754,7 @@ arr_ravel_multi_index(PyObject *self, PyObject *args, PyObject *kwds)
     PyArrayObject *ret = NULL;
     PyArray_Dims dimensions={0,0};
     npy_intp ravel_strides[NPY_MAXDIMS];
-    PyArray_ORDER order = NPY_CORDER;
+    NPY_ORDER order = NPY_CORDER;
     NPY_CLIPMODE modes[NPY_MAXDIMS];
 
     PyArrayObject *op[NPY_MAXARGS];
@@ -962,7 +962,7 @@ arr_unravel_index(PyObject *self, PyObject *args, PyObject *kwds)
     PyArrayObject *indices = NULL;
     PyArray_Descr *dtype = NULL;
     PyArray_Dims dimensions={0,0};
-    PyArray_ORDER order = PyArray_CORDER;
+    NPY_ORDER order = NPY_CORDER;
     npy_intp unravel_size;
 
     NpyIter *iter = NULL;