Last patch broke _MSC_VER case.

diff --git a/ChangeLog b/ChangeLog
index ea6b8a2777a3b67e1442d0504ff1deb20006c7f8..fde3a624579eaba5dcafd31e230c67aed251dd99 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-12  Bruno Haible  <bruno@clisp.org>
+
+       * lib/inttypes_.h (_LONG_LONG_FORMAT_PREFIX): Don't define for MSVC or
+       mingw.
+       (_PRI64_PREFIX, _PRIu64_PREFIX, _SCN64_PREFIX, _SCNu64_PREFIX): Handle
+       MSVC and mingw explicitly.
+
 2006-10-11  Simon Josefsson  <jas@extundo.com>
             Bruno Haible  <bruno@clisp.org>
 

diff --git a/lib/inttypes_.h b/lib/inttypes_.h
index 6500118dcb566b8dd19e8c22babd7ead046aa49d..2379540369d500e5632707bdc55fb081b6c7fb2f 100644 (file)
--- a/lib/inttypes_.h
+++ b/lib/inttypes_.h
@@ -46,9 +46,7 @@
 
 #if ! defined __cplusplus || defined __STDC_FORMAT_MACROS
 
-# if defined _MSC_VER || defined __MINGW32__
-#  define _LONG_LONG_FORMAT_PREFIX "I64"
-# elif defined _TNS_R_TARGET
+# if defined _TNS_R_TARGET
    /* Tandem NonStop R series and compatible platforms released before
       July 2005 support %Ld but not %lld.  */
 #  define _LONG_LONG_FORMAT_PREFIX "L"
@@ -167,6 +165,8 @@
 # ifdef INT64_MAX
 #  if INT64_MAX == LONG_MAX
 #   define _PRI64_PREFIX "l"
+#  elif defined _MSC_VER || defined __MINGW32__
+#   define _PRI64_PREFIX "I64"
 #  elif @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
 #   define _PRI64_PREFIX _LONG_LONG_FORMAT_PREFIX
 #  endif
@@ -182,6 +182,8 @@
 # ifdef UINT64_MAX
 #  if UINT64_MAX == ULONG_MAX
 #   define _PRIu64_PREFIX "l"
+#  elif defined _MSC_VER || defined __MINGW32__
+#   define _PRIu64_PREFIX "I64"
 #  elif @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
 #   define _PRIu64_PREFIX _LONG_LONG_FORMAT_PREFIX
 #  endif
@@ -656,6 +658,8 @@
 # ifdef INT64_MAX
 #  if INT64_MAX == LONG_MAX
 #   define _SCN64_PREFIX "l"
+#  elif defined _MSC_VER || defined __MINGW32__
+#   define _SCN64_PREFIX "I64"
 #  elif @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
 #   define _SCN64_PREFIX _LONG_LONG_FORMAT_PREFIX
 #  endif
@@ -671,6 +675,8 @@
 # ifdef UINT64_MAX
 #  if UINT64_MAX == ULONG_MAX
 #   define _SCNu64_PREFIX "l"
+#  elif defined _MSC_VER || defined __MINGW32__
+#   define _SCNu64_PREFIX "I64"
 #  elif @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
 #   define _SCNu64_PREFIX _LONG_LONG_FORMAT_PREFIX
 #  endif