From: Paul Eggert Date: Sat, 20 Jun 2015 16:57:08 +0000 (-0700) Subject: wchar: fix MinGW compilation warnings X-Git-Tag: v1.0~7037 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=e1085f202f0937aa2875d3135d1babdf07812706;p=gnulib.git 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. --- diff --git a/ChangeLog b/ChangeLog index 002afa84bb..2901d771a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2015-06-20 Paul Eggert + + 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 uniname/uniname-tests: use pristine data files diff --git a/lib/wchar.in.h b/lib/wchar.in.h index b760822cbe..70305d5a52 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 -> -> , and the latter includes , once indirectly -> -> ->