Support size specifier 'j' on all platforms.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 6eb19566fc408fc2d2bfeb6cfa142d95880ec13c..51d34cd128daafb4e085a49753bbe1c91414e908 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,8 @@
+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.
+
 2007-03-04  Bruno Haible  <bruno@clisp.org>
 
        * libgnuintl.h.in (libintl_printf): Treat BeOS like NetBSD and Woe32

diff --git a/gettext-runtime/intl/printf-parse.c b/gettext-runtime/intl/printf-parse.c
index 57b72fc5d46d4b06f827168b3916391f680110d1..ab3ecc746c3e2ec83c12e4a1a5d6c87fdcaa600e 100644 (file)
--- a/gettext-runtime/intl/printf-parse.c
+++ b/gettext-runtime/intl/printf-parse.c
@@ -29,12 +29,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>
@@ -327,7 +331,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))
@@ -342,7 +345,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/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index 6af8ceb33702a4125aa5d74a7001287ba870bb18..7482b588eade9971576d165d4135980d6b224fa8 100644 (file)
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,8 @@
+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.
+
 2007-02-25  Bruno Haible  <bruno@clisp.org>
 
        * vasnprintf.c (VASNPRINTF): Fix estimate of size needed for a 'a' or

diff --git a/gettext-runtime/libasprintf/printf-parse.c b/gettext-runtime/libasprintf/printf-parse.c
index 57b72fc5d46d4b06f827168b3916391f680110d1..ab3ecc746c3e2ec83c12e4a1a5d6c87fdcaa600e 100644 (file)
--- a/gettext-runtime/libasprintf/printf-parse.c
+++ b/gettext-runtime/libasprintf/printf-parse.c
@@ -29,12 +29,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>
@@ -327,7 +331,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))
@@ -342,7 +345,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'