diff options
| author | Mark Wiebe <mwwiebe@gmail.com> | 2011-04-05 15:58:08 -0700 |
|---|---|---|
| committer | Mark Wiebe <mwwiebe@gmail.com> | 2011-04-05 15:58:08 -0700 |
| commit | a4100ba6c440bdf2a2b3cfc31995eb5e009846ee (patch) | |
| tree | 77b72b7bd25cf3fa15bc28c84b04eb6ea27e5c6c /numpy | |
| parent | 85ed5d0cdf876aa2de9c30a68f9617c8b632f34a (diff) | |
| download | numpy-a4100ba6c440bdf2a2b3cfc31995eb5e009846ee.tar.gz | |
BUG: Fix INTP printf formatting string on 64-bit windows
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/include/numpy/ndarraytypes.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/numpy/core/include/numpy/ndarraytypes.h b/numpy/core/include/numpy/ndarraytypes.h index 4cd2de70e..fb10c12d6 100644 --- a/numpy/core/include/numpy/ndarraytypes.h +++ b/numpy/core/include/numpy/ndarraytypes.h @@ -285,7 +285,7 @@ typedef Py_uintptr_t npy_uintp; #define NPY_MAX_INTP NPY_MAX_INT #define NPY_MIN_INTP NPY_MIN_INT #define NPY_MAX_UINTP NPY_MAX_UINT - #define NPY_INTP_FMT "d" + #define NPY_INTP_FMT NPY_INT_FMT #elif NPY_SIZEOF_PY_INTPTR_T == NPY_SIZEOF_LONG #define NPY_INTP NPY_LONG #define NPY_UINTP NPY_ULONG @@ -294,7 +294,7 @@ typedef Py_uintptr_t npy_uintp; #define NPY_MAX_INTP NPY_MAX_LONG #define NPY_MIN_INTP MIN_LONG #define NPY_MAX_UINTP NPY_MAX_ULONG - #define NPY_INTP_FMT "ld" + #define NPY_INTP_FMT NPY_LONG_FMT #elif defined(PY_LONG_LONG) && (NPY_SIZEOF_PY_INTPTR_T == NPY_SIZEOF_LONGLONG) #define NPY_INTP NPY_LONGLONG #define NPY_UINTP NPY_ULONGLONG @@ -303,11 +303,7 @@ typedef Py_uintptr_t npy_uintp; #define NPY_MAX_INTP NPY_MAX_LONGLONG #define NPY_MIN_INTP NPY_MIN_LONGLONG #define NPY_MAX_UINTP NPY_MAX_ULONGLONG -#ifdef _MSC_VER - #define NPY_INTP_FMT "lld" -#else - #define NPY_INTP_FMT "Ld" -#endif + #define NPY_INTP_FMT NPY_LONGLONG_FMT #endif /* |