added wxVListBox::OnDrawBackground(); fixed warnings

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

diff --git a/include/wx/gsocket.h b/include/wx/gsocket.h
index 40f367c6cc31ec52d8a47ef9d12d3826d19d711b..a03616a9fcdb676c2f6c907c8404fd42bfd192f4 100644 (file)
--- a/include/wx/gsocket.h
+++ b/include/wx/gsocket.h
@@ -14,11 +14,11 @@
 #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(  WXDLLIMPEXP_NET )
+#define WXDLLIMPEXP_NET
 #endif
 
 #endif
@@ -26,10 +26,20 @@
 #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__) && !defined(__WXWINCE__)
 #include <sys/types.h>
 #endif
 
+#ifdef __WXWINCE__
+#include <stdlib.h>
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -241,7 +251,7 @@ void GSocket_SetTimeout(GSocket *socket, unsigned long millisec);
  *  operations do not clear this back to GSOCK_NOERROR, so use it only
  *  after an error.
  */
-GSocketError WXDLLEXPORT GSocket_GetError(GSocket *socket);
+GSocketError WXDLLIMPEXP_NET GSocket_GetError(GSocket *socket);
 
 
 /* Callbacks */