diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2012-01-28 18:40:19 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2012-02-04 16:11:39 -0700 |
| commit | b63f91e4ce487c89a67ca31ccb2e1c53574b7857 (patch) | |
| tree | 52f0027c9cfdbfd34c27cd04cc82ac51715053a6 /numpy/f2py/src | |
| parent | 6f9a3ce3545d73d338d6e4467992b66c143093f8 (diff) | |
| download | numpy-b63f91e4ce487c89a67ca31ccb2e1c53574b7857.tar.gz | |
STY: f2py - replace macros in old_defines.h with new.
Diffstat (limited to 'numpy/f2py/src')
| -rw-r--r-- | numpy/f2py/src/fortranobject.c | 4 | ||||
| -rw-r--r-- | numpy/f2py/src/test/foomodule.c | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/numpy/f2py/src/fortranobject.c b/numpy/f2py/src/fortranobject.c index ff80fa7e5..f5e2c6244 100644 --- a/numpy/f2py/src/fortranobject.c +++ b/numpy/f2py/src/fortranobject.c @@ -51,10 +51,10 @@ PyFortranObject_New(FortranDataDef* defs, f2py_void_func init) { PyDict_SetItemString(fp->dict,fp->defs[i].name,v); } else if ((fp->defs[i].data)!=NULL) { /* Is Fortran variable or array (not allocatable) */ - if (fp->defs[i].type == PyArray_STRING) { + if (fp->defs[i].type == NPY_STRING) { int n = fp->defs[i].rank-1; v = PyArray_New(&PyArray_Type, n, fp->defs[i].dims.d, - PyArray_STRING, NULL, fp->defs[i].data, fp->defs[i].dims.d[n], + NPY_STRING, NULL, fp->defs[i].data, fp->defs[i].dims.d[n], NPY_FARRAY, NULL); } else { diff --git a/numpy/f2py/src/test/foomodule.c b/numpy/f2py/src/test/foomodule.c index ed839b3d5..10f02f42b 100644 --- a/numpy/f2py/src/test/foomodule.c +++ b/numpy/f2py/src/test/foomodule.c @@ -63,10 +63,10 @@ static PyObject *mod_init(PyObject *capi_self, PyObject *capi_args, /* F90 module */ static FortranDataDef f2py_mod_def[] = { - {"a",0, {}, PyArray_INT}, - {"b",0, {}, PyArray_DOUBLE}, - {"c",1, {3}, PyArray_DOUBLE}, - {"d",1, {-1}, PyArray_DOUBLE}, + {"a",0, {}, NPY_INT}, + {"b",0, {}, NPY_DOUBLE}, + {"c",1, {3}, NPY_DOUBLE}, + {"d",1, {-1}, NPY_DOUBLE}, {"init",-1,{},0,NULL,(void *)mod_init}, {NULL} }; @@ -84,9 +84,9 @@ extern void F_FUNC(f2pyinitmod,F2PYINITMOD)(); /* COMMON block */ static FortranDataDef f2py_foodata_def[] = { - {"a",0, {}, PyArray_INT}, - {"b",0, {}, PyArray_DOUBLE}, - {"c",1, {3}, PyArray_DOUBLE}, + {"a",0, {}, NPY_INT}, + {"b",0, {}, NPY_DOUBLE}, + {"c",1, {3}, NPY_DOUBLE}, {NULL} }; static void f2py_setup_foodata(char *a,char *b,char *c) { |