diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-06-20 07:27:43 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-06-20 07:27:43 +0000 |
| commit | b29b5900de7389529d369f35a5f9629e8463c275 (patch) | |
| tree | 611609935028c089e5d43c192be6e35ad7db5316 /numpy/numarray/numpy_numarray | |
| parent | 4f3c3755d9fcbfd9ce0551c19bb893e7ba73db91 (diff) | |
| download | numpy-b29b5900de7389529d369f35a5f9629e8463c275.tar.gz | |
Fix reference-count problem in z **= 1 and more numarray compatiblity fixes.
Diffstat (limited to 'numpy/numarray/numpy_numarray')
| -rw-r--r-- | numpy/numarray/numpy_numarray/arraybase.h | 5 | ||||
| -rw-r--r-- | numpy/numarray/numpy_numarray/libnumarray.h | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/numpy/numarray/numpy_numarray/arraybase.h b/numpy/numarray/numpy_numarray/arraybase.h index cf4043491..00e2f4c6c 100644 --- a/numpy/numarray/numpy_numarray/arraybase.h +++ b/numpy/numarray/numpy_numarray/arraybase.h @@ -3,6 +3,7 @@ #define SZ_BUF 79 #define MAXDIM MAX_DIMS +#define MAXARGS 18 #define maybelong intp @@ -57,8 +58,6 @@ typedef struct { Float64 r, i; } Complex64; #define PyArray_ISFORTRAN_CONTIGUOUS(m) (((PyArray(m))->flags & FORTRAN_CONTIGUOUS) != 0) #define PyArray_ISBYTESWAPPED(m) (!PyArray_ISNOTSWAPPED(m)) #define PyArray_ISWRITABLE PyArray_ISWRITEABLE -#define PyArray_ISSPACESAVER(m) 0 -#define PyArray_ISCARRAY(m) (((PyArray(m))->flags & IS_CARRAY) == IS_CARRAY) -#endif /* +#endif diff --git a/numpy/numarray/numpy_numarray/libnumarray.h b/numpy/numarray/numpy_numarray/libnumarray.h index 301fa2e94..f897b4f3f 100644 --- a/numpy/numarray/numpy_numarray/libnumarray.h +++ b/numpy/numarray/numpy_numarray/libnumarray.h @@ -10,6 +10,7 @@ #include "nummacro.h" #include "numcomplex.h" #include "ieeespecial.h" +#include "cfunc.h" #ifdef __cplusplus extern "C" { @@ -604,10 +605,6 @@ static PyArrayObject * NA_FromArrayStruct (PyObject *a); /* Total number of C API pointers */ #define libnumarray_API_pointers 131 - -#endif /* !defined(_libnumarray) */ - - #ifdef __cplusplus } #endif |