[Scipy-svn] r2927 - in trunk/Lib: interpolate sandbox/arpack

[scipy-svn at scipy.org]

Author: fullung
Date: 2007-04-17 05:11:39 -0500 (Tue, 17 Apr 2007)
New Revision: 2927

Modified:
   trunk/Lib/interpolate/__fitpack.h
   trunk/Lib/sandbox/arpack/setup.py
Log:
Fixed two Windows compilation issues.


Modified: trunk/Lib/interpolate/__fitpack.h
===================================================================
--- trunk/Lib/interpolate/__fitpack.h	2007-04-16 21:54:00 UTC (rev 2926)
+++ trunk/Lib/interpolate/__fitpack.h	2007-04-17 10:11:39 UTC (rev 2927)
@@ -556,6 +556,7 @@
   double *t, *c, *tt, *cc;
   PyArrayObject *ap_t = NULL, *ap_c = NULL, *ap_tt = NULL, *ap_cc = NULL;
   PyObject *t_py = NULL, *c_py = NULL;
+  PyObject *ret = NULL;
   if (!PyArg_ParseTuple(args, "iOOidi",&iopt,&t_py,&c_py,&k, &x, &m)) return NULL;
   ap_t = (PyArrayObject *)PyArray_ContiguousFromObject(t_py, PyArray_DOUBLE, 0, 1);
   ap_c = (PyArrayObject *)PyArray_ContiguousFromObject(c_py, PyArray_DOUBLE, 0, 1);
@@ -577,7 +578,7 @@
   }
   Py_DECREF(ap_c);
   Py_DECREF(ap_t);
-  PyObject* ret = Py_BuildValue("NNi",PyArray_Return(ap_tt),PyArray_Return(ap_cc),ier);
+  ret = Py_BuildValue("NNi",PyArray_Return(ap_tt),PyArray_Return(ap_cc),ier);
   return ret;
   
   fail:

Modified: trunk/Lib/sandbox/arpack/setup.py
===================================================================
--- trunk/Lib/sandbox/arpack/setup.py	2007-04-16 21:54:00 UTC (rev 2926)
+++ trunk/Lib/sandbox/arpack/setup.py	2007-04-17 10:11:39 UTC (rev 2927)
@@ -18,7 +18,8 @@
 #    arpack_sources.extend([os.path.join('ARPACK','BLAS', '*.f')])
     arpack_sources.extend([os.path.join('ARPACK','LAPACK', '*.f')])
 
-    config.add_library('arpack', sources=arpack_sources)
+    config.add_library('arpack', sources=arpack_sources,
+                       include_dirs=[os.path.join(['ARPACK', 'SRC'])])
 
 
     config.add_extension('_arpack',