Fixed OS/2 compilation problems.

[wxWidgets.git] / include / wx / msw / gsockmsw.h

diff --git a/include/wx/msw/gsockmsw.h b/include/wx/msw/gsockmsw.h
index 001c18be4668064777603040812092fdd3da0bde..c558049e1ff9f6232114271183ab0b2fd1bf82e5 100644 (file)
--- a/include/wx/msw/gsockmsw.h
+++ b/include/wx/msw/gsockmsw.h
@@ -9,14 +9,32 @@
 #ifndef __GSOCK_MSW_H
 #define __GSOCK_MSW_H
 
-#ifdef __WXMSW__
+#ifndef __GSOCKET_STANDALONE__
+#include "wx/setup.h"
+#endif
+
+#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
+
+#ifndef __GSOCKET_STANDALONE__
 #include "wx/gsocket.h"
 #else
 #include "gsocket.h"
 #endif
 
+#include <windows.h>
 #include <winsock.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#ifndef FALSE
+#define FALSE 0
+#endif
 
 /* Definition of GSocket */
 struct _GSocket
@@ -26,13 +44,16 @@ struct _GSocket
   GAddress *m_peer;
   GSocketError m_error;
 
-  bool m_non_blocking;
-  bool m_server;
-  bool m_stream;
-  bool m_oriented;
+  /* Attributes */
+  int m_non_blocking;
+  int m_server;
+  int m_stream;
+  int m_oriented;
+  int m_establishing;
   struct timeval m_timeout;
 
   /* Callbacks */
+  GSocketEventFlags m_detected;
   GSocketCallback m_cbacks[GSOCK_MAX_EVENT];
   char *m_data[GSOCK_MAX_EVENT];
   int m_msgnumber;
@@ -50,15 +71,11 @@ struct _GAddress
   GSocketError m_error;
 };
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Input / output */
 
 GSocketError _GSocket_Input_Timeout(GSocket *socket);
 GSocketError _GSocket_Output_Timeout(GSocket *socket);
+GSocketError _GSocket_Connect_Timeout(GSocket *socket);
 int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size);
 int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size);
 int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size);
@@ -66,17 +83,20 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size);
 
 /* Callbacks */
 
-void _GSocket_Configure_Callbacks(GSocket *socket);
+int  _GSocket_GUI_Init(GSocket *socket);
+void _GSocket_GUI_Destroy(GSocket *socket);
+
 LRESULT CALLBACK _GSocket_Internal_WinProc(HWND, UINT, WPARAM, LPARAM);
 
+void _GSocket_Enable_Events(GSocket *socket);
+void _GSocket_Disable_Events(GSocket *socket);
+
 /* GAddress */
 
 GSocketError _GAddress_translate_from(GAddress *address,
                                       struct sockaddr *addr, int len);
-
-GSocketError _GAddress_translate_to(GAddress *address,
-                                    struct sockaddr **addr, int *len);
-
+GSocketError _GAddress_translate_to  (GAddress *address,
+                                      struct sockaddr **addr, int *len);
 GSocketError _GAddress_Init_INET(GAddress *address);
 GSocketError _GAddress_Init_UNIX(GAddress *address);
 
@@ -84,4 +104,6 @@ GSocketError _GAddress_Init_UNIX(GAddress *address);
 }
 #endif
 
+#endif  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
+
 #endif  /* __GSOCK_MSW_H */