explicit cast for digital mars to use OLE

[wxWidgets.git] / include / wx / gsocket.h

diff --git a/include/wx/gsocket.h b/include/wx/gsocket.h
index 40f367c6cc31ec52d8a47ef9d12d3826d19d711b..54db19bc4eae2a0826c71eb2a1f6b21abec583e8 100644 (file)
--- a/include/wx/gsocket.h
+++ b/include/wx/gsocket.h
@@ -14,8 +14,8 @@
 #ifndef __GSOCKET_STANDALONE__
 #include "wx/setup.h"
 
 #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
 
 #if !defined( __WXMSW__ ) && !defined(  WXDLLEXPORT )
 #define WXDLLEXPORT


@@ -26,7 +26,13 @@
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
 #include <stddef.h>
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
 #include <stddef.h>

-#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 <sys/types.h>
 #endif
 
 #include <sys/types.h>
 #endif