solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Revert "Move Cygwin __USE_W32_SOCKETS definition to wxMSW-specific file"

Browse source 
This reverts commit 0f2b8a2065 as it broke
Cygwin build due to problems with fd_set definition.

Closes #23674.
This commit is contained in:
Vadim Zeitlin 2023-07-09 17:03:21 +02:00
parent a5c0a81798
commit 6bd2b6b4db
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/wx/defs.h
View file

@ -163,6 +163,12 @@
# endif
#endif
/* Prevents conflicts between sys/types.h and winsock.h with Cygwin, */
/* when using Windows sockets. */
#if defined(__CYGWIN__) && defined(__WINDOWS__)
#define __USE_W32_SOCKETS
#endif
/* ---------------------------------------------------------------------------- */
/* wxWidgets version and compatibility defines */
/* ---------------------------------------------------------------------------- */

6
include/wx/msw/gccpriv.h
View file

@ -83,12 +83,6 @@
#define __CYGWIN10__
#endif
/* Prevents conflicts between sys/types.h and winsock.h with Cygwin, */
/* when using Windows sockets. */
#if defined(__CYGWIN__)
#define __USE_W32_SOCKETS
#endif
/*
Traditional MinGW (but not MinGW-w64 nor TDM-GCC) omits many POSIX
functions from their headers when compiled with __STRICT_ANSI__ defined.

6
tests/allheaders.cpp
View file

@ -45,9 +45,9 @@
// We have to include this one first in order to check for wxUSE_XXX below.
#include "wx/setup.h"
// Normally this is done in include/wx/msw/gccpriv.h included from wx/defs.h,
// but as we don't include it here, we need to do it manually to avoid warnings
// inside the standard headers included from catch.hpp.
// Normally this is done in wx/defs.h, but as we don't include it here, we need
// to do it manually to avoid warnings inside the standard headers included
// from catch.hpp.
#if defined(__CYGWIN__) && defined(__WINDOWS__)
#define __USE_W32_SOCKETS
#endif