Mercurial > hg > octave-jordi > gnulib-hg
changeset 18021:aac9b5fb9783
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.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Sat, 20 Jun 2015 09:57:08 -0700 |
| parents | 12844a6aa2e0 |
| children | 706f963a786b |
| files | ChangeLog lib/wchar.in.h |
| diffstat | 2 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2015-06-20 Paul Eggert <eggert@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 <ueno@gnu.org> uniname/uniname-tests: use pristine data files
--- 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>