Updated to version 1.40 of Scintilla

[wxWidgets.git] / src / motif / gsockmot.c

diff --git a/src/motif/gsockmot.c b/src/motif/gsockmot.c
index 797c3cff7bc88d826fef7c3a7777b9f9c893ae78..1297cecdee1d7517042c0227e99b3842224f9259 100644 (file)
--- a/src/motif/gsockmot.c
+++ b/src/motif/gsockmot.c
@@ -32,9 +32,8 @@ static void _GSocket_Motif_Output(XtPointer data, int *fid,
   _GSocket_Detected_Write(socket);
 }
 
-void _GSocket_GUI_Init(GSocket *socket)
+int _GSocket_GUI_Init(GSocket *socket)
 {
-  int i;
   int *m_id;
 
   socket->m_gui_dependent = (char *)malloc(sizeof(int)*2);
@@ -42,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)
@@ -117,4 +118,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 */