From 7cbaf6927272fde1d8fb2fb58e67d067a91cd93b Mon Sep 17 00:00:00 2001 From: Keith Marshall Date: Thu, 7 Sep 2017 22:45:17 +0100 Subject: [PATCH] Correct misuse of __INSIDE_MSYS__ feature test. --- w32api/ChangeLog | 8 ++++++++ w32api/include/winsock2.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/w32api/ChangeLog b/w32api/ChangeLog index a363eb5..1afc463 100644 --- a/w32api/ChangeLog +++ b/w32api/ChangeLog @@ -1,5 +1,13 @@ 2017-09-07 Keith Marshall + Correct misuse of __INSIDE_MSYS__ feature test. + + * include/winsock2.h [!__INSIDE_MSYS__]: One of several instances + omits "defined" operator; it should be expressed consistently as... + [! defined __INSIDE_MSYS__]: ...this; correct it. + +2017-09-07 Keith Marshall + Prepare for vs. refactoring. * include/winsock.h: Tidy layout; assert copyright. diff --git a/w32api/include/winsock2.h b/w32api/include/winsock2.h index 2ca0503..437743d 100644 --- a/w32api/include/winsock2.h +++ b/w32api/include/winsock2.h @@ -148,7 +148,7 @@ int PASCAL __WSAFDIsSet (SOCKET, fd_set *); #warning "Your may cause runtime problems with W32 sockets." #endif /* !_SYS_TYPES_FD_SET */ -#if ! (defined __INSIDE_CYGWIN__ || (__INSIDE_MSYS__)) +#if ! (defined __INSIDE_CYGWIN__ || defined __INSIDE_MSYS__) #ifndef _TIMEVAL_DEFINED /* FIXME: These should be factored out; they are properly defined -- 2.11.0