X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16c1f79c04174b8c5e81828c20199724d9593b72..695c21b11876abafeb68195e34f9f55816f92949:/src/gtk1/gsockgtk.c diff --git a/src/gtk1/gsockgtk.c b/src/gtk1/gsockgtk.c index c1500dfba0..fc88b47ddb 100644 --- a/src/gtk1/gsockgtk.c +++ b/src/gtk1/gsockgtk.c @@ -9,6 +9,7 @@ #if wxUSE_SOCKETS +#include #include #include @@ -31,9 +32,8 @@ void _GSocket_GDK_Input(gpointer data, _GSocket_Detected_Write(socket); } -void _GSocket_GUI_Init(GSocket *socket) +int _GSocket_GUI_Init(GSocket *socket) { - int i; gint *m_id; socket->m_gui_dependent = (char *)malloc(sizeof(gint)*2); @@ -41,6 +41,8 @@ void _GSocket_GUI_Init(GSocket *socket) m_id[0] = -1; m_id[1] = -1; + + return TRUE; } void _GSocket_GUI_Destroy(GSocket *socket) @@ -59,7 +61,7 @@ void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event) switch (event) { case GSOCK_LOST: /* fall-through */ - case GSOCK_INPUT: c = 0; break; + case GSOCK_INPUT: c = 0; break; case GSOCK_OUTPUT: c = 1; break; case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break; default: return; @@ -79,10 +81,12 @@ void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event) gint *m_id = (gint *)(socket->m_gui_dependent); int c; + assert( m_id != NULL ); + switch (event) { case GSOCK_LOST: /* fall-through */ - case GSOCK_INPUT: c = 0; break; + case GSOCK_INPUT: c = 0; break; case GSOCK_OUTPUT: c = 1; break; case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break; default: return; @@ -106,4 +110,9 @@ void _GSocket_Disable_Events(GSocket *socket) _GSocket_Uninstall_Callback(socket, GSOCK_OUTPUT); } -#endif /* wxUSE_SOCKETS */ +#else /* !wxUSE_SOCKETS */ + +/* some compilers don't like having empty source files */ +static int wxDummyGsockVar = 0; + +#endif /* wxUSE_SOCKETS/!wxUSE_SOCKETS */