From: Bruno Haible <bruno@clisp.org>
Date: Fri, 18 May 2007 17:35:19 +0000 (+0000)
Subject: Support output of 64-bit numbers on mingw.
X-Git-Tag: cvs-readonly~388
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=3c57c210019baf91329294bdb00288ebb6f202df;p=gnulib.git

Support output of 64-bit numbers on mingw.
---

diff --git a/ChangeLog b/ChangeLog
index a659be19e..4d5569bc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 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
 	gl_FUNC_FREXPL_WORKS.
 	* modules/printf-frexpl (Files): Add m4/frexpl.m4.
diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index 45a219944..2c4b42110 100644
--- 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: