X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab8af15fed9b7323740032b4a23b20139a041481..e74563e412a08aa004c5429efed7ef0031c2c1bf:/include/wx/gsocket.h diff --git a/include/wx/gsocket.h b/include/wx/gsocket.h index 40f367c6cc..54db19bc4e 100644 --- a/include/wx/gsocket.h +++ b/include/wx/gsocket.h @@ -14,8 +14,8 @@ #ifndef __GSOCKET_STANDALONE__ #include "wx/setup.h" -// kludge for GTK.. gsockgtk.c craps out miserably if we include -// defs.h ... no idea how other files get away with it.. +/* kludge for GTK.. gsockgtk.c craps out miserably if we include + defs.h ... no idea how other files get away with it.. */ #if !defined( __WXMSW__ ) && !defined( WXDLLEXPORT ) #define WXDLLEXPORT @@ -26,7 +26,13 @@ #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) #include -#ifndef __WXMAC__ + +/* + Including sys/types.h under cygwin results in the warnings about "fd_set + having been defined in sys/types.h" when winsock.h is included later and + doesn't seem to be necessary anyhow. It's not needed under Mac neither. + */ +#if !defined(__WXMAC__) && !defined(__CYGWIN__) #include #endif