From fff6deee7b44bedd4deb03dd7b5762abe469dba7 Mon Sep 17 00:00:00 2001 From: Ralf Gommers Date: Sun, 16 Nov 2014 14:40:35 +0100 Subject: 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. --- numpy/f2py/src/fortranobject.c | 3 +++ numpy/f2py/src/fortranobject.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'numpy/f2py/src') diff --git a/numpy/f2py/src/fortranobject.c b/numpy/f2py/src/fortranobject.c index 37b0b0e62..e88e83f0e 100644 --- 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 index 2b52f7cb7..c9b54e259 100644 --- 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 -- cgit v1.2.1