part of SF patch #904166 (DMC fix)

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

diff --git a/include/wx/msw/gsockmsw.h b/include/wx/msw/gsockmsw.h
index d51271fc3f45646c558271e6856f99bc49537ade..a000ababea62464627de6c9761f83050627598b2 100644 (file)
--- a/include/wx/msw/gsockmsw.h
+++ b/include/wx/msw/gsockmsw.h
@@ -28,10 +28,6 @@
 extern "C" {
 #endif
 
-#if !defined(__cplusplus)
-typedef int bool;
-#endif
-
 #ifndef TRUE
 #define TRUE 1
 #endif
@@ -49,11 +45,11 @@ struct _GSocket
   GSocketError m_error;
 
   /* Attributes */
-  bool m_non_blocking;
-  bool m_server;
-  bool m_stream;
-  bool m_oriented;
-  bool m_establishing;
+  int m_non_blocking;
+  int m_server;
+  int m_stream;
+  int m_oriented;
+  int m_establishing;
   struct timeval m_timeout;
 
   /* Callbacks */
@@ -87,8 +83,10 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size);
 
 /* Callbacks */
 
-bool _GSocket_GUI_Init(GSocket *socket);
-void _GSocket_GUI_Destroy(GSocket *socket);
+int  _GSocket_GUI_Init(void);
+void _GSocket_GUI_Cleanup(void);
+int  _GSocket_GUI_Init_Socket(GSocket *socket);
+void _GSocket_GUI_Destroy_Socket(GSocket *socket);
 
 LRESULT CALLBACK _GSocket_Internal_WinProc(HWND, UINT, WPARAM, LPARAM);