diff options
| author | Julian Taylor <juliantaylor108@gmail.com> | 2014-10-21 22:04:21 +0200 |
|---|---|---|
| committer | Julian Taylor <juliantaylor108@gmail.com> | 2014-10-21 22:04:21 +0200 |
| commit | 0e091af94b03d5f3d5f5ddf45d54cf5ed2d7e612 (patch) | |
| tree | 0b613c62d0165dbaaa384c4cb2747e3aa8978043 /numpy/core | |
| parent | a435de365a603f29bf243882644f1e26edda6e9a (diff) | |
| parent | 0ddb8e35ea464da08ca3327482d96c2ec4640583 (diff) | |
| download | numpy-0e091af94b03d5f3d5f5ddf45d54cf5ed2d7e612.tar.gz | |
Merge pull request #5212 from charris/fix-long-long-fmt
BUG: Use 'll' as the default length specifier for long long.
Diffstat (limited to 'numpy/core')
| -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) |