diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-07-08 01:50:46 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-07-08 01:50:46 +0000 |
| commit | 21e52f005c9ee4a44a23cdec87d9eaa357bd31e5 (patch) | |
| tree | 29c9c2491114a0a2789af4a36f1e8ca96b7a3b2f /numpy/f2py | |
| parent | b6f0858d8b714f83e4c8a390fad310648cf0f823 (diff) | |
| download | numpy-21e52f005c9ee4a44a23cdec87d9eaa357bd31e5.tar.gz | |
Fix f2py and doc
Diffstat (limited to 'numpy/f2py')
| -rw-r--r-- | numpy/f2py/cfuncs.py | 2 | ||||
| -rw-r--r-- | numpy/f2py/src/fortranobject.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py index f60113a04..48373678f 100644 --- a/numpy/f2py/cfuncs.py +++ b/numpy/f2py/cfuncs.py @@ -220,7 +220,7 @@ cppmacros['SWAP']="""\ \ta = b;\\ \tb = c;} """ -#cppmacros['ISCONTIGUOUS']='#define ISCONTIGUOUS(m) ((m)->flags & CONTIGUOUS)' +#cppmacros['ISCONTIGUOUS']='#define ISCONTIGUOUS(m) ((m)->flags & NPY_CONTIGUOUS)' cppmacros['PRINTPYOBJERR']="""\ #define PRINTPYOBJERR(obj)\\ \tfprintf(stderr,\"#modulename#.error is related to \");\\ diff --git a/numpy/f2py/src/fortranobject.h b/numpy/f2py/src/fortranobject.h index 73d4fad60..b28848b79 100644 --- a/numpy/f2py/src/fortranobject.h +++ b/numpy/f2py/src/fortranobject.h @@ -96,7 +96,7 @@ typedef struct { extern PyObject * PyFortranObject_New(FortranDataDef* defs, f2py_void_func init); extern PyObject * PyFortranObject_NewAsAttr(FortranDataDef* defs); -#define ISCONTIGUOUS(m) ((m)->flags & CONTIGUOUS) +#define ISCONTIGUOUS(m) ((m)->flags & NPY_CONTIGUOUS) #define F2PY_INTENT_IN 1 #define F2PY_INTENT_INOUT 2 #define F2PY_INTENT_OUT 4 |