numpy.pxd: npy_complexX should be the C structs used by C NumPy, not Cython complex
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Tue, 20 Oct 2009 08:23:01 +0000 (10:23 +0200)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Tue, 20 Oct 2009 08:23:01 +0000 (10:23 +0200)
Cython/Includes/numpy.pxd

index 3f6c602fa45fd860f1300d048964df4f06014cb7..4fa741022a1e510e10cf2d410900f0e47a7e53b2 100644 (file)
@@ -293,12 +293,6 @@ cdef extern from "numpy/arrayobject.h":
     ctypedef long double  npy_float96
     ctypedef long double  npy_float128
 
-    ctypedef float complex        npy_complex64
-    ctypedef double complex       npy_complex128
-    ctypedef long double complex  npy_complex120
-    ctypedef long double complex  npy_complex192
-    ctypedef long double complex  npy_complex256
-
     ctypedef struct npy_cfloat:
         double real
         double imag
@@ -311,6 +305,26 @@ cdef extern from "numpy/arrayobject.h":
         double real
         double imag
 
+    ctypedef struct npy_complex64:
+        double real
+        double imag
+
+    ctypedef struct npy_complex128:
+        double real
+        double imag
+
+    ctypedef struct npy_complex160:
+        double real
+        double imag
+
+    ctypedef struct npy_complex192:
+        double real
+        double imag
+        
+    ctypedef struct npy_complex256:
+        double real
+        double imag
+
     ctypedef struct PyArray_Dims:
         npy_intp *ptr
         int len