]> Savannah Git Hosting - gnulib.git/commitdiff
wchar: fix MinGW compilation warnings
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 20 Jun 2015 16:57:08 +0000 (09:57 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 20 Jun 2015 16:57:42 +0000 (09:57 -0700)
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
lib/wchar.in.h

index 002afa84bbc000c0ca5bf9dcd4ed4def6a6625a4..2901d771a24e33ebf5fe93110e6eee4190b41621 100644 (file)
--- 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
index b760822cbe39bccac0722001b7d32cb0449726bf..70305d5a5262978a328eb87187e66c0fef958ade 100644 (file)
 #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>