Merge pull request scipy#4871 from cgohlke/patch-1

BLD: fix msvc compile errors
charris · May 17, 2015 · 12690b0 · 12690b0
2 parents e153b5d + 48d8c83
commit 12690b0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/scipy/signal/lfilter.c.src b/scipy/signal/lfilter.c.src
@@ -355,7 +355,7 @@ zfill(const PyArrayObject * x, intp nx, char *xzfilled, intp nxzfilled)
     if (nx > 0) {
         for (i = 0; i < nx; ++i) {
             copyswap(xzfilled + i * nxl,
-                     PyArray_DATA((PyArrayObject *)x) + i * nxl,
+                     (char *)PyArray_DATA((PyArrayObject *)x) + i * nxl,
                      0, NULL);
         }
     }

diff --git a/scipy/signal/sigtoolsmodule.c b/scipy/signal/sigtoolsmodule.c
@@ -947,7 +947,7 @@ PyObject *PyArray_OrderFilterND(PyObject *op1, PyObject *op2, int order) {
 	PyDataMem_FREE(zptr);
 	zptr = PyArray_Zero(ap1);
 	if (zptr == NULL) goto fail;
-	ap1_ptr = PyArray_DATA(ap1) + offset1*is1;
+	ap1_ptr = (char *)PyArray_DATA(ap1) + offset1*is1;
 	for (k=0; k < PyArray_NDIM(ap1); k++) {
             a_ind[k] = mode_dep[k];
             check_ind[k] = PyArray_DIMS(ap1)[k] - PyArray_DIMS(ap2)[k] - mode_dep[k] - 1;

diff --git a/scipy/spatial/ckdtree/src/ckdtree_cpp_methods.h b/scipy/spatial/ckdtree/src/ckdtree_cpp_methods.h
@@ -32,7 +32,7 @@ prefetch_datapoint(const npy_float64 *x, const npy_intp m)
 }
 #else
 #if defined(_WIN32)
-#include <xmmininrin.h>
+#include <xmmintrin.h>
 inline void
 prefetch_datapoint(const npy_float64 *x, const npy_intp m)
 {