Merge pull request numpy#3678 from charris/fix-wrong-variable-type

charris · charris · commit 0a91ade9e89b · 2013-09-04T07:06:21.000-07:00
BUG: PyArray_PyIntAsIntp had variable size check wrong way around.
diff --git a/numpy/core/src/multiarray/conversion_utils.c b/numpy/core/src/multiarray/conversion_utils.c
@@ -726,9 +726,9 @@ NPY_NO_EXPORT npy_intp
 PyArray_PyIntAsIntp(PyObject *o)
 {
 #if (NPY_SIZEOF_LONG < NPY_SIZEOF_INTP)
-    npy_long long_value = -1;
+    long long long_value = -1;
 #else
-    npy_longlong long_value = -1;
+    long long_value = -1;
 #endif
     PyObject *obj, *err;
     static char *msg = "an integer is required";
