Support output of 64-bit numbers on mingw.

diff --git a/ChangeLog b/ChangeLog
index a659be19e0e9d9f6fcd24919eb9162acb7dce95f..4d5569bc2e3dd9ce5d0d07f4f4e11e1c7b84b769 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-18  Bruno Haible  <bruno@clisp.org>
+
+       * lib/vasnprintf.m4 (VASNPRINTF) [WIN32]: Use %I64d instead of %lld
+       for printing 64-bit integers. Needed for mingw.
+
 2007-05-18  Bruno Haible  <bruno@clisp.org>
 
        * m4/printf-frexpl.m4 (gl_FUNC_PRINTF_FREXPL): Invoke

diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index 45a219944499a0b6bfc52394ca5f9fa1c740f846..2c4b42110cac5f0eabb084ee263124d63fd11c1e 100644 (file)
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -1088,8 +1088,15 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
 #if HAVE_LONG_LONG_INT
                  case TYPE_LONGLONGINT:
                  case TYPE_ULONGLONGINT:
+# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+                   *fbp++ = 'I';
+                   *fbp++ = '6';
+                   *fbp++ = '4';
+                   break;
+# else
                    *fbp++ = 'l';
                    /*FALLTHROUGH*/
+# endif
 #endif
                  case TYPE_LONGINT:
                  case TYPE_ULONGINT: