From 78f66726040a87d3d0955f1d437c5a7c745bc632 Mon Sep 17 00:00:00 2001 From: Eric Fode Date: Sun, 15 Jul 2012 12:00:41 -0400 Subject: Added cast to error check, and fixed indentation. --- numpy/core/src/multiarray/common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/numpy/core/src/multiarray/common.c b/numpy/core/src/multiarray/common.c index 4973df1be..123ec62e7 100644 --- a/numpy/core/src/multiarray/common.c +++ b/numpy/core/src/multiarray/common.c @@ -36,8 +36,9 @@ _array_find_python_scalar_type(PyObject *op) /* if integer can fit into a longlong then return that*/ if ((PyLong_AsLongLong(op) == -1) && PyErr_Occurred()) { PyErr_Clear(); - if((PyLong_AsUnsignedLongLong(op) == -1) && PyErr_Occurred()){ - PyErr_Clear(); + if ((PyLong_AsUnsignedLongLong(op) == (unsigned long long) -1) + && PyErr_Occurred()){ + PyErr_Clear(); } else { return PyArray_DescrFromType(NPY_ULONGLONG); -- cgit v1.2.1