8000 Merge pull request #5212 from charris/fix-long-long-fmt · numpy/numpy@ddb5e79 · GitHub
[go: up one dir, main page]
Skip to content

Commit ddb5e79

Browse files
juliantaylorjuliantaylor
committed
Merge pull request #5212 from charris/fix-long-long-fmt
BUG: Use 'll' as the default length specifier for long long.
2 parents d310ff9 + 0ddb8e3 commit ddb5e79

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

‎numpy/core/include/numpy/npy_common.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -264,18 +264,9 @@ typedef unsigned PY_LONG_LONG npy_ulonglong;
264264
# ifdef _MSC_VER
265265
# define NPY_LONGLONG_FMT "I64d"
266266
# define NPY_ULONGLONG_FMT "I64u"
267-
# elif defined(__APPLE__) || defined(__FreeBSD__)
268-
/* "%Ld" only parses 4 bytes -- "L" is floating modifier on MacOS X/BSD */
267+
# else
269268
# define NPY_LONGLONG_FMT "lld"
270269
# define NPY_ULONGLONG_FMT "llu"
271-
/*
272-
another possible variant -- *quad_t works on *BSD, but is deprecated:
273-
#define LONGLONG_FMT "qd"
274-
#define ULONGLONG_FMT "qu"
275-
*/
276-
# else
277-
# define NPY_LONGLONG_FMT "Ld"
278-
# define NPY_ULONGLONG_FMT "Lu"
279270
# endif
280271
# ifdef _MSC_VER
281272
# define NPY_LONGLONG_SUFFIX(x) (x##i64)

0 commit comments

Comments
 (0)
0