[Scipy-svn] r6694 - in trunk/scipy: interpolate spatial

[scipy-svn at scipy.org]

Author: ptvirtan
Date: 2010-09-09 12:31:47 -0500 (Thu, 09 Sep 2010)
New Revision: 6694

Modified:
   trunk/scipy/interpolate/interpnd.c
   trunk/scipy/interpolate/interpnd.pyx
   trunk/scipy/spatial/qhull.c
   trunk/scipy/spatial/qhull.pxd
Log:
BUG: interpolate/spatial: include numpy/ndarrayobject.h instead of ndarraytypes.h

Modified: trunk/scipy/interpolate/interpnd.c
===================================================================
--- trunk/scipy/interpolate/interpnd.c	2010-09-07 21:53:55 UTC (rev 6693)
+++ trunk/scipy/interpolate/interpnd.c	2010-09-09 17:31:47 UTC (rev 6694)
@@ -157,7 +157,7 @@
 #include "stdio.h"
 #include "numpy/arrayobject.h"
 #include "numpy/ufuncobject.h"
-#include "numpy/ndarraytypes.h"
+#include "numpy/ndarrayobject.h"
 #include "math.h"
 
 #ifndef CYTHON_INLINE

Modified: trunk/scipy/interpolate/interpnd.pyx
===================================================================
--- trunk/scipy/interpolate/interpnd.pyx	2010-09-07 21:53:55 UTC (rev 6693)
+++ trunk/scipy/interpolate/interpnd.pyx	2010-09-09 17:31:47 UTC (rev 6694)
@@ -40,7 +40,7 @@
     double fmax(double a, double b) nogil
     double fabs(double a) nogil
 
-cdef extern from "numpy/ndarraytypes.h":
+cdef extern from "numpy/ndarrayobject.h":
     cdef enum:
         NPY_MAXDIMS
 

Modified: trunk/scipy/spatial/qhull.c
===================================================================
--- trunk/scipy/spatial/qhull.c	2010-09-07 21:53:55 UTC (rev 6693)
+++ trunk/scipy/spatial/qhull.c	2010-09-09 17:31:47 UTC (rev 6694)
@@ -154,7 +154,7 @@
 #include <math.h>
 #define __PYX_HAVE_API__scipy__spatial__qhull
 #include "stdlib.h"
-#include "numpy/ndarraytypes.h"
+#include "numpy/ndarrayobject.h"
 #include "stdio.h"
 #include "numpy/arrayobject.h"
 #include "numpy/ufuncobject.h"

Modified: trunk/scipy/spatial/qhull.pxd
===================================================================
--- trunk/scipy/spatial/qhull.pxd	2010-09-07 21:53:55 UTC (rev 6693)
+++ trunk/scipy/spatial/qhull.pxd	2010-09-09 17:31:47 UTC (rev 6694)
@@ -13,7 +13,7 @@
     void *malloc(int size)
     void free(void *ptr)
 
-cdef extern from "numpy/ndarraytypes.h":
+cdef extern from "numpy/ndarrayobject.h":
     cdef enum:
         NPY_MAXDIMS