diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2014-10-21 09:09:56 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2014-10-21 09:15:55 -0600 |
| commit | 0ddb8e35ea464da08ca3327482d96c2ec4640583 (patch) | |
| tree | c649fa17213c80d3c0d4595e1f8a156b6344060e | |
| parent | 8b1f90a227b5fcf2a481c973e522693758c9f20f (diff) | |
| download | numpy-0ddb8e35ea464da08ca3327482d96c2ec4640583.tar.gz | |
BUG: Use 'll' as the default length specifier for long long.
The previous default was 'L', which seems gcc specific, whereas
'll' is the now recognized standard and is also accepted by gcc.
Closes #5027.
| -rw-r--r-- | numpy/core/include/numpy/npy_common.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/numpy/core/include/numpy/npy_common.h b/numpy/core/include/numpy/npy_common.h index 5cba8c9d2..ad7c72f40 100644 --- a/numpy/core/include/numpy/npy_common.h +++ b/numpy/core/include/numpy/npy_common.h @@ -264,18 +264,9 @@ typedef unsigned PY_LONG_LONG npy_ulonglong; # ifdef _MSC_VER # define NPY_LONGLONG_FMT "I64d" # define NPY_ULONGLONG_FMT "I64u" -# elif defined(__APPLE__) || defined(__FreeBSD__) -/* "%Ld" only parses 4 bytes -- "L" is floating modifier on MacOS X/BSD */ +# else # define NPY_LONGLONG_FMT "lld" # define NPY_ULONGLONG_FMT "llu" -/* - another possible variant -- *quad_t works on *BSD, but is deprecated: - #define LONGLONG_FMT "qd" - #define ULONGLONG_FMT "qu" -*/ -# else -# define NPY_LONGLONG_FMT "Ld" -# define NPY_ULONGLONG_FMT "Lu" # endif # ifdef _MSC_VER # define NPY_LONGLONG_SUFFIX(x) (x##i64) |