From: Bruno Haible Date: Mon, 1 May 2017 10:58:28 +0000 (+0200) Subject: wctype: Fix problems if gets included after . X-Git-Tag: v1.0~6215 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=e48f55fd7c253e0363072b6163012e5cead89b55;p=gnulib.git wctype: Fix problems if gets included after . * lib/wctype.in.h: Include not only but also . Do so also on MSVC. Reported by Eli Zaretskii . --- diff --git a/ChangeLog b/ChangeLog index 2de382e959..d268b9e31c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2017-05-01 Bruno Haible + + wctype: Fix problems if gets included after . + * lib/wctype.in.h: Include not only but also . Do so + also on MSVC. + Reported by Eli Zaretskii . + 2017-05-01 Bruno Haible wchar: Fix compilation error with the original mingw.org mingw. diff --git a/lib/wctype.in.h b/lib/wctype.in.h index 933bf788bf..759659b1df 100644 --- a/lib/wctype.in.h +++ b/lib/wctype.in.h @@ -56,11 +56,13 @@ # include #endif -/* mingw has declarations of towupper and towlower in as - well . Include in advance to avoid rpl_ prefix - being added to the declarations. */ -#ifdef __MINGW32__ +/* Native Windows (mingw, MSVC) have declarations of towupper, towlower, and + isw* functions in , as well as in . Include + , in advance to avoid rpl_ prefix being added to the + declarations. */ +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ # include +# include #endif /* Include the original if it exists.