Update from GNU gettext 0.15.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 9c59ea5115bd046514823c6874e7594393400458..006ac240ed0309d202445af55470a7c2fed9c949 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-05  Bruno Haible  <bruno@clisp.org>
+
+       * printf-args.c (printf_fetchargs): Work around broken definition of
+       wint_t on mingw.
+
 2005-02-12  Bruno Haible  <bruno@clisp.org>
 
        * xallocsa.h: Add extern "C" for C++.

diff --git a/lib/printf-args.c b/lib/printf-args.c
index 615858c4e619583b889c49633809184a86424dd6..76134562200ec8130f0d4e80f5386a9e7982398b 100644 (file)
--- a/lib/printf-args.c
+++ b/lib/printf-args.c
@@ -1,5 +1,5 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2003, 2005-2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -79,7 +79,13 @@ printf_fetchargs (va_list args, arguments *a)
        break;
 #ifdef HAVE_WINT_T
       case TYPE_WIDE_CHAR:
-       ap->a.a_wide_char = va_arg (args, wint_t);
+       /* Although ISO C 99 7.24.1.(2) says that wint_t is "unchanged by
+          default argument promotions", this is not the case in mingw32,
+          where wint_t is 'unsigned short'.  */
+       ap->a.a_wide_char =
+         (sizeof (wint_t) < sizeof (int)
+          ? va_arg (args, int)
+          : va_arg (args, wint_t));
        break;
 #endif
       case TYPE_STRING: