Private gsocket files were using 'typedef int bool', removed this

and replaced by true ints. Currently this was not causing any problem
but it is better to avoid bool at all in C code as a matter of good
coding practice.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/gsockmsw.h b/include/wx/msw/gsockmsw.h
index d51271fc3f45646c558271e6856f99bc49537ade..c558049e1ff9f6232114271183ab0b2fd1bf82e5 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,7 +83,7 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size);
 
 /* Callbacks */
 
-bool _GSocket_GUI_Init(GSocket *socket);
+int  _GSocket_GUI_Init(GSocket *socket);
 void _GSocket_GUI_Destroy(GSocket *socket);
 
 LRESULT CALLBACK _GSocket_Internal_WinProc(HWND, UINT, WPARAM, LPARAM);

diff --git a/include/wx/unix/gsockunx.h b/include/wx/unix/gsockunx.h
index e44fef0eb310c0dcf4bdfc6a1be9b31631fb83eb..dc0e17071641b2b2fa0ceb504c6798281fdbde90 100644 (file)
--- a/include/wx/unix/gsockunx.h
+++ b/include/wx/unix/gsockunx.h
@@ -26,10 +26,6 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#if !defined(__cplusplus)
-typedef int bool;
-#endif
-
 #ifndef TRUE
 #define TRUE 1
 #endif
@@ -47,11 +43,11 @@ struct _GSocket
   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 */
@@ -85,7 +81,7 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size);
 
 /* Callbacks */
 
-bool _GSocket_GUI_Init(GSocket *socket);
+int  _GSocket_GUI_Init(GSocket *socket);
 void _GSocket_GUI_Destroy(GSocket *socket);
 
 void _GSocket_Enable_Events(GSocket *socket);

diff --git a/src/gtk/gsockgtk.c b/src/gtk/gsockgtk.c
index 8551a7d13b08fa921aa85563829e64fc2e690be4..3202c6b42139cfae3f9a269aef5b5db625938997 100644 (file)
--- a/src/gtk/gsockgtk.c
+++ b/src/gtk/gsockgtk.c
@@ -31,7 +31,7 @@ void _GSocket_GDK_Input(gpointer data,
     _GSocket_Detected_Write(socket);
 }
 
-bool _GSocket_GUI_Init(GSocket *socket)
+int _GSocket_GUI_Init(GSocket *socket)
 {
   gint *m_id;
 

diff --git a/src/gtk1/gsockgtk.c b/src/gtk1/gsockgtk.c
index 8551a7d13b08fa921aa85563829e64fc2e690be4..3202c6b42139cfae3f9a269aef5b5db625938997 100644 (file)
--- a/src/gtk1/gsockgtk.c
+++ b/src/gtk1/gsockgtk.c
@@ -31,7 +31,7 @@ void _GSocket_GDK_Input(gpointer data,
     _GSocket_Detected_Write(socket);
 }
 
-bool _GSocket_GUI_Init(GSocket *socket)
+int _GSocket_GUI_Init(GSocket *socket)
 {
   gint *m_id;
 

diff --git a/src/motif/gsockmot.c b/src/motif/gsockmot.c
index 41459ce67947e9994ff3447ca8b00e65b199b089..1297cecdee1d7517042c0227e99b3842224f9259 100644 (file)
--- a/src/motif/gsockmot.c
+++ b/src/motif/gsockmot.c
@@ -32,7 +32,7 @@ static void _GSocket_Motif_Output(XtPointer data, int *fid,
   _GSocket_Detected_Write(socket);
 }
 
-bool _GSocket_GUI_Init(GSocket *socket)
+int _GSocket_GUI_Init(GSocket *socket)
 {
   int *m_id;
 

diff --git a/src/msw/gsockmsw.c b/src/msw/gsockmsw.c
index 849752e7d6bf0a381f7a5f150832660c04596d2d..60d54c682c1395e96269dc8bda9de8e48a0ae646 100644 (file)
--- a/src/msw/gsockmsw.c
+++ b/src/msw/gsockmsw.c
@@ -137,7 +137,7 @@ void GSocket_Cleanup(void)
 
 /* Per-socket GUI initialization / cleanup */
 
-bool _GSocket_GUI_Init(GSocket *socket)
+int _GSocket_GUI_Init(GSocket *socket)
 {
   int i;