From: Bruno Haible Date: Fri, 21 Apr 2017 13:28:40 +0000 (+0200) Subject: Avoid accidental use of native Windows APIs on Cygwin. X-Git-Tag: v1.0~6271 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=bf549858b26842f0ba1c54c16026080b2bd6e2e5;p=gnulib.git Avoid accidental use of native Windows APIs on Cygwin. * lib/getaddrinfo.c (WINDOWS_NATIVE): Don't define on Cygwin. * lib/localcharset.c (WINDOWS_NATIVE): Likewise. * lib/localename.c (WINDOWS_NATIVE): Likewise. --- diff --git a/ChangeLog b/ChangeLog index bc44a578e0..ff8b4e68a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2017-04-21 Bruno Haible + + Avoid accidental use of native Windows APIs on Cygwin. + * lib/getaddrinfo.c (WINDOWS_NATIVE): Don't define on Cygwin. + * lib/localcharset.c (WINDOWS_NATIVE): Likewise. + * lib/localename.c (WINDOWS_NATIVE): Likewise. + 2017-04-20 Bruno Haible Remove red warnings from the generated MODULES.html. diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c index 38f3dd198d..7dd7c8e68e 100644 --- a/lib/getaddrinfo.c +++ b/lib/getaddrinfo.c @@ -54,7 +54,7 @@ # define PF_UNSPEC 0 #endif -#if defined _WIN32 || defined __WIN32__ +#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ # define WINDOWS_NATIVE #endif diff --git a/lib/localcharset.c b/lib/localcharset.c index ec8601174c..3c2b1ac8c8 100644 --- a/lib/localcharset.c +++ b/lib/localcharset.c @@ -32,7 +32,7 @@ # define DARWIN7 /* Darwin 7 or newer, i.e. Mac OS X 10.3 or newer */ #endif -#if defined _WIN32 || defined __WIN32__ +#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ # define WINDOWS_NATIVE # include #endif diff --git a/lib/localename.c b/lib/localename.c index 89ce88974f..3ba9d08664 100644 --- a/lib/localename.c +++ b/lib/localename.c @@ -61,7 +61,7 @@ extern char * getlocalename_l(int, locale_t); # endif #endif -#if defined _WIN32 || defined __WIN32__ +#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ # define WINDOWS_NATIVE # if !defined IN_LIBINTL # include "glthread/lock.h"