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
This commit is contained in:
parent
e7b596fbff
commit
27a97d02eb
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user