Support 'j' size specifier on all platforms.

diff --git a/ChangeLog b/ChangeLog
index 4ca6de2937ee6abe04cfdeda80bf485ae1a53921..aeabcc00d74378327f7c4d2990830b93b15d491d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-25  Bruno Haible  <bruno@clisp.org>
+
+       * lib/printf-parse.c [!IN_LIBINTL]: Include <stdint.h>, for intmax_t.
+       (PRINTF_PARSE): Make the support for size specifier 'j' unconditional.
+       * modules/vasnprintf (Depends-on): Add stdint.
+
 2007-03-25  Bruno Haible  <bruno@clisp.org>
 
        * modules/fpieee: New file.

diff --git a/lib/printf-parse.c b/lib/printf-parse.c
index f5cdb6e5b51173dc1448d5639e908ef1888c14c5..ff494044f54a7c3d2c294dd15a431440614efd0b 100644 (file)
--- a/lib/printf-parse.c
+++ b/lib/printf-parse.c
@@ -28,12 +28,16 @@
 #include <stddef.h>
 
 /* Get intmax_t.  */
-#if HAVE_STDINT_H_WITH_UINTMAX
+#ifdef IN_LIBINTL
+# if HAVE_STDINT_H_WITH_UINTMAX
+#  include <stdint.h>
+# endif
+# if HAVE_INTTYPES_H_WITH_UINTMAX
+#  include <inttypes.h>
+# endif
+#else
 # include <stdint.h>
 #endif
-#if HAVE_INTTYPES_H_WITH_UINTMAX
-# include <inttypes.h>
-#endif
 
 /* malloc(), realloc(), free().  */
 #include <stdlib.h>
@@ -326,7 +330,6 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
                      flags += 8;
                      cp++;
                    }
-#if HAVE_INTMAX_T
                  else if (*cp == 'j')
                    {
                      if (sizeof (intmax_t) > sizeof (long))
@@ -341,7 +344,6 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
                        }
                      cp++;
                    }
-#endif
                  else if (*cp == 'z' || *cp == 'Z')
                    {
                      /* 'z' is standardized in ISO C 99, but glibc uses 'Z'

diff --git a/modules/vasnprintf b/modules/vasnprintf
index ff78604d4507c49a7802f2473d2f5eef7c184479..21e20480c8587f45f095fa6c7e5398c0b66221e7 100644 (file)
--- a/modules/vasnprintf
+++ b/modules/vasnprintf
@@ -22,6 +22,7 @@ m4/vasnprintf.m4
 
 Depends-on:
 alloca-opt
+stdint
 xsize
 
 configure.ac: