Adapt to changes in gnulib.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 2966f06eb344b541d9d61bbb30cd6b3acf831485..dc182df0fd7bea478c67ef709c4dbc204608aca3 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,14 @@
+2007-06-10  Bruno Haible  <bruno@clisp.org>
+
+       * printf-parse.c: Don't include config.h and the specification
+       header if PRINTF_PARSE is already defined. Eliminate the set of
+       parameters for WIDE_CHAR_VERSION; the user of this file must provide
+       them now. Include c-ctype.h.
+       (PRINTF_PARSE) [ENABLE_UNISTDIO]: Add code implementing the 'U'
+       directive and CHAR_T_ONLY_ASCII.
+       * printf.c: Include wprintf-parse.h. Define the set of parameters for
+       the WIDE_CHAR_VERSION.
+
 2007-06-07  Bruno Haible  <bruno@clisp.org>
 
        * gettextP.h (gl_locale_name_canonicalize, gl_locale_name_posix,

diff --git a/gettext-runtime/intl/printf.c b/gettext-runtime/intl/printf.c
index 7492808a782378548e88bf2b6db41542b7ad589a..0088e5195bccedf189009414980b1e5e3d1aebd7 100644 (file)
--- a/gettext-runtime/intl/printf.c
+++ b/gettext-runtime/intl/printf.c
@@ -285,7 +285,12 @@ libintl_asprintf (char **resultp, const char *format, ...)
 
 #define WIDE_CHAR_VERSION 1
 
+#include "wprintf-parse.h"
 /* Define auxiliary functions declared in "wprintf-parse.h".  */
+#define CHAR_T wchar_t
+#define DIRECTIVE wchar_t_directive
+#define DIRECTIVES wchar_t_directives
+#define PRINTF_PARSE wprintf_parse
 #include "printf-parse.c"
 
 /* Define functions declared in "vasnprintf.h".  */