MAINT: change place where NPY_NO_DEPRECATED_API is defined in f2py.

This makes sure to undef at the end, and by putting the define in the C code it ensures that the error message is understandable.
fourpartswater · Nov 16, 2014 · fff6dee · fff6dee
1 parent f14d5e1
commit fff6dee
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/numpy/f2py/rules.py b/numpy/f2py/rules.py
@@ -109,6 +109,8 @@
  * $D"""+"""ate:$
  * Do not edit this file directly unless you know what you are doing!!!
  */
+
+#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
 #ifdef __cplusplus
 extern \"C\" {
 #endif
@@ -232,6 +234,7 @@
 #ifdef __cplusplus
 }
 #endif
+#undef NPY_NO_DEPRECATED_API
 """,
     'separatorsfor':{'latexdoc':'\n\n',
                      'restdoc':'\n\n'},

diff --git a/numpy/f2py/src/fortranobject.c b/numpy/f2py/src/fortranobject.c
@@ -1,4 +1,5 @@
 #define FORTRANOBJECT_C
+#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
 #include "fortranobject.h"
 
 #ifdef __cplusplus
@@ -1032,4 +1033,6 @@ F2PyCapsule_Check(PyObject *ptr)
 #ifdef __cplusplus
 }
 #endif
+
+#undef NPY_NO_DEPRECATED_API
 /************************* EOF fortranobject.c *******************************/
diff --git a/numpy/f2py/src/fortranobject.h b/numpy/f2py/src/fortranobject.h
@@ -4,8 +4,6 @@
 extern "C" {
 #endif
 
-#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
-
 #include "Python.h"
 
 #ifdef FORTRANOBJECT_C