#ifndef __GSOCKET_H
#define __GSOCKET_H
+/* DFE: Define this and compile gsocket.cpp instead of gsocket.c and
+ compile existing GUI gsock*.c as C++ to try out the new GSocket. */
+/* #define wxUSE_GSOCKET_CPLUSPLUS 1 */
+#undef wxUSE_GSOCKET_CPLUSPLUS
+#if !defined(__cplusplus) && defined(wxUSE_GSOCKET_CPLUSPLUS)
+#error "You need to compile this file (probably a GUI gsock peice) as C++"
+#endif
+
#ifndef __GSOCKET_STANDALONE__
#include "wx/setup.h"
+#include "wx/platform.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
+#include "wx/dlimpexp.h" // for WXDLLIMPEXP_NET
#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__) && !defined(__WXWINCE__)
#include <sys/types.h>
#endif
+#ifdef __WXWINCE__
+#include <stdlib.h>
+#endif
+
+#ifdef wxUSE_GSOCKET_CPLUSPLUS
+typedef class GSocketBSD GSocket;
+#endif //def wxUSE_GSOCKET_CPLUSPLUS
+
#ifdef __cplusplus
extern "C" {
#endif
+#ifndef wxUSE_GSOCKET_CPLUSPLUS
typedef struct _GSocket GSocket;
+#endif //ndef wxUSE_GSOCKET_CPLUSPLUS
typedef struct _GAddress GAddress;
typedef enum {
char *cdata);
+/* Functions tables for internal use by GSocket code: */
+
+#ifndef __WINDOWS__
+struct GSocketBaseFunctionsTable
+{
+ void (*Detected_Read)(GSocket *socket);
+ void (*Detected_Write)(GSocket *socket);
+};
+#endif
+
+struct GSocketGUIFunctionsTable
+{
+ int (*GUI_Init)(void);
+ void (*GUI_Cleanup)(void);
+ int (*GUI_Init_Socket)(GSocket *socket);
+ void (*GUI_Destroy_Socket)(GSocket *socket);
+#ifndef __WINDOWS__
+ void (*Install_Callback)(GSocket *socket, GSocketEvent event);
+ void (*Uninstall_Callback)(GSocket *socket, GSocketEvent event);
+#endif
+ void (*Enable_Events)(GSocket *socket);
+ void (*Disable_Events)(GSocket *socket);
+};
+
+
/* Global initializers */
+/* Sets GUI functions callbacks. Must be called *before* GSocket_Init
+ if the app uses async sockets. */
+void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc);
+
/* GSocket_Init() must be called at the beginning */
int GSocket_Init(void);
void GSocket_destroy(GSocket *socket);
+#ifndef wxUSE_GSOCKET_CPLUSPLUS
/* GSocket_Shutdown:
* Disallow further read/write operations on this socket, close
*/
void GSocket_SetTimeout(GSocket *socket, unsigned long millisec);
+#endif //ndef wxUSE_GSOCKET_CPLUSPLUS
+
/* GSocket_GetError:
* Returns the last error occured for this socket. Note that successful
* 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);
+#ifndef wxUSE_GSOCKET_CPLUSPLUS
/* Callbacks */
*/
void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags);
+#endif //ndef wxUSE_GSOCKET_CPLUSPLUS
+
/* GAddress */
}
#endif /* __cplusplus */
+#ifdef wxUSE_GSOCKET_CPLUSPLUS
+#include "wx/unix/gsockunx.h"
+#endif // def wxUSE_GSOCKET_CPLUSPLUS
#endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */