Removed unnecessary code from utilsunx.cpp

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

diff --git a/include/wx/unix/gsockunx.h b/include/wx/unix/gsockunx.h
index 2981d1293f1e59a6ff00c6378524fb6ba74f00e3..1c18fc1726397c14e71aebebd25508e2b7d41e20 100644 (file)
--- a/include/wx/unix/gsockunx.h
+++ b/include/wx/unix/gsockunx.h
@@ -5,14 +5,22 @@
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
+
 #ifndef __GSOCK_UNX_H
 #define __GSOCK_UNX_H
 
+#ifndef __GSOCKET_STANDALONE__
 #include "wx/setup.h"
+#endif
 
-#if wxUSE_SOCKETS
+#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
+#ifndef __GSOCKET_STANDALONE__
 #include "wx/gsocket.h"
+#else
+#include "gsocket.h"
+#endif
+
 
 #ifdef __cplusplus
 extern "C" {
@@ -20,27 +28,31 @@ extern "C" {
 
 
 /* Definition of GSocket */
-struct _GSocket {
+struct _GSocket
+{
   int m_fd;
-  GAddress *m_local, *m_peer;
+  GAddress *m_local;
+  GAddress *m_peer;
   GSocketError m_error;
 
-  bool m_non_blocking, m_server, m_stream, m_oriented;
+  bool m_non_blocking;
+  bool m_server;
+  bool m_stream;
+  bool m_oriented;
   bool m_establishing;
   unsigned long m_timeout;
 
   /* Callbacks */
+  GSocketEventFlags m_detected;
   GSocketCallback m_cbacks[GSOCK_MAX_EVENT];
   char *m_data[GSOCK_MAX_EVENT];
 
-  /* IO calls associated */
-  bool m_iocalls[GSOCK_MAX_EVENT];
-
   char *m_gui_dependent;
 };
 
 /* Definition of GAddress */
-struct _GAddress {
+struct _GAddress
+{
   struct sockaddr *m_addr;
   size_t m_len;
 
@@ -50,38 +62,43 @@ struct _GAddress {
   GSocketError m_error;
 };
 
-void _GSocket_Enable(GSocket *socket, GSocketEvent event);
-void _GSocket_Disable(GSocket *socket, GSocketEvent event);
+/* Input / Output */
+
+GSocketError _GSocket_Input_Timeout(GSocket *socket);
+GSocketError _GSocket_Output_Timeout(GSocket *socket);
 int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size);
 int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size);
 int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size);
 int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size);
-void _GSocket_Install_Callback(GSocket *socket, GSocketEvent count);
-void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent count);
+
+/* 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);
 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);
+
+/* GAddress */
 
-/* Translaters returns false when memory is exhausted */
 GSocketError _GAddress_translate_from(GAddress *address,
                                       struct sockaddr *addr, int len);
-GSocketError _GAddress_translate_to(GAddress *address,
-                                    struct sockaddr **addr, int *len);
-
-/* Initialisers returns FALSE when an error happened in the initialisation */
-
-/* Internet address family */
+GSocketError _GAddress_translate_to  (GAddress *address,
+                                      struct sockaddr **addr, int *len);
 GSocketError _GAddress_Init_INET(GAddress *address);
-/* Local address family */
 GSocketError _GAddress_Init_UNIX(GAddress *address);
 
+
 #ifdef __cplusplus
 }
-#endif /* __cplusplus */
+#endif  /* __cplusplus */
 
-#endif
-    /* wxUSE_SOCKETS */
+#endif  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
 
-#endif
-    /* __GSOCK_UNX_H */
+#endif  /* __GSOCK_UNX_H */