summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authorrgommers <ralf.gommers@googlemail.com>2010-08-14 13:42:38 +0000
committerrgommers <ralf.gommers@googlemail.com>2010-08-14 13:42:38 +0000
commit0a312665ee43b12758760e9ca7bc6c161f2525a5 (patch)
tree5e194661c438414b9b8a838309ca3509ae7c0585 /numpy
parent6cfb3ff7d24f87257f067359fdf0957fad8f6718 (diff)
downloadnumpy-0a312665ee43b12758760e9ca7bc6c161f2525a5.tar.gz
BUG: Better format specifier for Py 2.7, 3.2 on win-amd64. Closes #1570.
Thanks to Christoph Gohlke.
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/include/numpy/ndarraytypes.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/numpy/core/include/numpy/ndarraytypes.h b/numpy/core/include/numpy/ndarraytypes.h
index 7b059720d..e64ddea6d 100644
--- a/numpy/core/include/numpy/ndarraytypes.h
+++ b/numpy/core/include/numpy/ndarraytypes.h
@@ -275,8 +275,12 @@ 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
+#endif
/*
* We can only use C99 formats for npy_int_p if it is the same as