Added support for building wxCocoa

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

diff --git a/include/wx/gsocket.h b/include/wx/gsocket.h
index 5f6924aed3f7d0a70cea3e123f637e8fb2e7f94c..54db19bc4eae2a0826c71eb2a1f6b21abec583e8 100644 (file)
--- a/include/wx/gsocket.h
+++ b/include/wx/gsocket.h
@@ -13,12 +13,26 @@
 
 #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.. */
+
+#if !defined( __WXMSW__ ) && !defined(  WXDLLEXPORT )
+#define WXDLLEXPORT
+#endif
+

 #endif
 
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
 #include <stddef.h>
 #endif
 
 #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
 


@@ -233,7 +247,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.
  */
  *  operations do not clear this back to GSOCK_NOERROR, so use it only
  *  after an error.
  */

-GSocketError GSocket_GetError(GSocket *socket);
+GSocketError WXDLLEXPORT GSocket_GetError(GSocket *socket);

 
 
 /* Callbacks */
 
 
 /* Callbacks */


@@ -309,7 +323,7 @@ GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path);
 GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf);
 
 #ifdef __cplusplus
 GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf);
 
 #ifdef __cplusplus

-};
+}

 #endif /* __cplusplus */
 
 
 #endif /* __cplusplus */