Applied patch [ 581139 ] Misc wxCmdLineParser changes/fixes

[wxWidgets.git] / include / wx / unix / gsockunx.h

diff --git a/include/wx/unix/gsockunx.h b/include/wx/unix/gsockunx.h
index 1c18fc1726397c14e71aebebd25508e2b7d41e20..dc0e17071641b2b2fa0ceb504c6798281fdbde90 100644 (file)
--- a/include/wx/unix/gsockunx.h
+++ b/include/wx/unix/gsockunx.h
@@ -26,6 +26,14 @@
 extern "C" {
 #endif /* __cplusplus */
 
 extern "C" {
 #endif /* __cplusplus */
 

+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+

 
 /* Definition of GSocket */
 struct _GSocket
 
 /* Definition of GSocket */
 struct _GSocket


@@ -35,11 +43,11 @@ struct _GSocket
   GAddress *m_peer;
   GSocketError m_error;
 
   GAddress *m_peer;
   GSocketError m_error;
 

-  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;

   unsigned long m_timeout;
 
   /* Callbacks */
   unsigned long m_timeout;
 
   /* Callbacks */


@@ -73,18 +81,19 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size);
 
 /* Callbacks */
 
 
 /* Callbacks */
 

-void _GSocket_Enable(GSocket *socket, GSocketEvent event);
-void _GSocket_Disable(GSocket *socket, GSocketEvent event);
-void _GSocket_Detected_Read(GSocket *socket);
-void _GSocket_Detected_Write(GSocket *socket);
-
-void _GSocket_GUI_Init(GSocket *socket);
+int  _GSocket_GUI_Init(GSocket *socket);

 void _GSocket_GUI_Destroy(GSocket *socket);
 void _GSocket_GUI_Destroy(GSocket *socket);

+

 void _GSocket_Enable_Events(GSocket *socket);
 void _GSocket_Disable_Events(GSocket *socket);
 void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event);
 void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event);
 
 void _GSocket_Enable_Events(GSocket *socket);
 void _GSocket_Disable_Events(GSocket *socket);
 void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event);
 void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event);
 

+void _GSocket_Enable(GSocket *socket, GSocketEvent event);
+void _GSocket_Disable(GSocket *socket, GSocketEvent event);
+void _GSocket_Detected_Read(GSocket *socket);
+void _GSocket_Detected_Write(GSocket *socket);
+

 /* GAddress */
 
 GSocketError _GAddress_translate_from(GAddress *address,
 /* GAddress */
 
 GSocketError _GAddress_translate_from(GAddress *address,