Eli Zaretskii wrote:
And this solved the issue. There are now no warnings about wcwidth.
Thanks, I installed into Gnulib the attached, which uses that fix (reindenting while we're in the neighborhood).
>From 6b3a754b48d5c22625218981c51090fa834418bb Mon Sep 17 00:00:00 2001 From: Paul Eggert <egg...@cs.ucla.edu> Date: Sat, 20 Jun 2015 09:57:08 -0700 Subject: [PATCH] wchar: fix MinGW compilation warnings This lets Texinfo compile cleanly. See Eli Zaretskii in: http://lists.gnu.org/archive/html/bug-gnulib/2015-06/msg00050.html * lib/wchar.in.h: Do not use special invocation convention on MinGW. --- ChangeLog | 7 +++++++ lib/wchar.in.h | 9 +++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 002afa8..2901d77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2015-06-20 Paul Eggert <egg...@cs.ucla.edu> + + wchar: fix MinGW compilation warnings + This lets Texinfo compile cleanly. See Eli Zaretskii in: + http://lists.gnu.org/archive/html/bug-gnulib/2015-06/msg00050.html + * lib/wchar.in.h: Do not use special invocation convention on MinGW. + 2015-06-20 Daiki Ueno <u...@gnu.org> uniname/uniname-tests: use pristine data files diff --git a/lib/wchar.in.h b/lib/wchar.in.h index b760822..70305d5 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -30,9 +30,14 @@ #endif @PRAGMA_COLUMNS@ -#if defined __need_mbstate_t || defined __need_wint_t || (defined __hpux && ((defined _INTTYPES_INCLUDED && !defined strtoimax) || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) || defined _GL_ALREADY_INCLUDING_WCHAR_H +#if (((defined __need_mbstate_t || defined __need_wint_t) \ + && !defined __MINGW32__) \ + || (defined __hpux \ + && ((defined _INTTYPES_INCLUDED && !defined strtoimax) \ + || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) \ + || defined _GL_ALREADY_INCLUDING_WCHAR_H) /* Special invocation convention: - - Inside glibc and uClibc header files. + - Inside glibc and uClibc header files, but not MinGW. - On HP-UX 11.00 we have a sequence of nested includes <wchar.h> -> <stdlib.h> -> <stdint.h>, and the latter includes <wchar.h>, once indirectly <stdint.h> -> <sys/types.h> -> <inttypes.h> -> <wchar.h> -- 2.1.0
