diff options
| author | Ralf Gommers <ralf.gommers@googlemail.com> | 2014-11-23 22:15:51 +0100 |
|---|---|---|
| committer | Ralf Gommers <ralf.gommers@googlemail.com> | 2014-11-23 22:15:51 +0100 |
| commit | 3202612006ce651913d2fd448e3eb6393ba8414b (patch) | |
| tree | 2223e7ee05015834c7a5ff703e925d508ad682e4 /numpy/f2py | |
| parent | 31b94e85a99db998bd6156d2b800386973fef3e1 (diff) | |
| download | numpy-3202612006ce651913d2fd448e3eb6393ba8414b.tar.gz | |
MAINT: remove NPY_NO_DEPRECATED_API define from f2py.
See gh-5281 for discussion. With the defines in, compiling scipy 0.14.0 and
below isn't possible.
Diffstat (limited to 'numpy/f2py')
| -rw-r--r-- | numpy/f2py/rules.py | 2 | ||||
| -rw-r--r-- | numpy/f2py/src/fortranobject.c | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/numpy/f2py/rules.py b/numpy/f2py/rules.py index b46776777..52679966b 100644 --- a/numpy/f2py/rules.py +++ b/numpy/f2py/rules.py @@ -110,7 +110,6 @@ module_rules={ * 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 @@ -234,7 +233,6 @@ PyMODINIT_FUNC init#modulename#(void) { #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 index e88e83f0e..37b0b0e62 100644 --- a/numpy/f2py/src/fortranobject.c +++ b/numpy/f2py/src/fortranobject.c @@ -1,5 +1,4 @@ #define FORTRANOBJECT_C -#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION #include "fortranobject.h" #ifdef __cplusplus @@ -1033,6 +1032,4 @@ F2PyCapsule_Check(PyObject *ptr) #ifdef __cplusplus } #endif - -#undef NPY_NO_DEPRECATED_API /************************* EOF fortranobject.c *******************************/ |