diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-09-04 07:06:21 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-09-04 07:06:21 -0700 |
| commit | 0a91ade9e89bde3163ad9035556b912dfc90db16 (patch) | |
| tree | 9ba40550314f7c78358706366ef0dd6f4045f0aa | |
| parent | 7ae0206c4b5685a3b0abd1865850e0c92aeb7389 (diff) | |
| parent | 3c8eb4eb396bd5227f2d8298ce60be0c4848fe0e (diff) | |
| download | numpy-0a91ade9e89bde3163ad9035556b912dfc90db16.tar.gz | |
Merge pull request #3678 from charris/fix-wrong-variable-type
BUG: PyArray_PyIntAsIntp had variable size check wrong way around.
| -rw-r--r-- | numpy/core/src/multiarray/conversion_utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/src/multiarray/conversion_utils.c b/numpy/core/src/multiarray/conversion_utils.c index 9450766ab..a0e479ba9 100644 --- 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"; |