[Numpy-svn] r8629 - branches/1.5.x/numpy/core/include/numpy

[numpy-svn at scipy.org]

Author: rgommers
Date: 2010-08-14 08:57:01 -0500 (Sat, 14 Aug 2010)
New Revision: 8629

Modified:
   branches/1.5.x/numpy/core/include/numpy/ndarraytypes.h
Log:
BUG: (backport of r8622) Better format specifier for Py 2.7, 3.2 on win-amd64. Closes #1570.

Thanks to Christoph Gohlke.

Modified: branches/1.5.x/numpy/core/include/numpy/ndarraytypes.h
===================================================================
--- branches/1.5.x/numpy/core/include/numpy/ndarraytypes.h	2010-08-14 13:45:26 UTC (rev 8628)
+++ branches/1.5.x/numpy/core/include/numpy/ndarraytypes.h	2010-08-14 13:57:01 UTC (rev 8629)
@@ -275,8 +275,12 @@
         #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