Whole lot of stuff for new wxFileDialog

[wxWidgets.git] / src / unix / gsockunx.h

diff --git a/src/unix/gsockunx.h b/src/unix/gsockunx.h
index 29cfe50e2a8e27c8fa887001221107675ae33bff..79321a2374f52e7cf4a7dd44e43b7c0ba9240c30 100644 (file)
--- a/src/unix/gsockunx.h
+++ b/src/unix/gsockunx.h
@@ -8,7 +8,16 @@
 #ifndef __GSOCK_UNX_H
 #define __GSOCK_UNX_H
 
-#include <wx/gsocket.h>
+#include "wx/setup.h"
+
+#if wxUSE_SOCKETS
+
+#include "wx/gsocket.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 
 /* Definition of GSocket */
 struct _GSocket {
@@ -16,11 +25,11 @@ struct _GSocket {
   GAddress *m_local, *m_peer;
   GSocketError m_error;
 
-  bool m_blocking, m_server, m_stream, m_oriented;
+  bool m_non_blocking, m_server, m_stream, m_oriented;
   unsigned long m_timeout;
 
   /* Callbacks */
-  GSocketCallback m_fbacks[GSOCK_MAX_EVENT];
+  GSocketCallback m_cbacks[GSOCK_MAX_EVENT];
   char *m_data[GSOCK_MAX_EVENT];
 
   /* IO calls associated */
@@ -52,14 +61,26 @@ 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 _GAddress_translate_from(GAddress *address,
-                              struct sockaddr *addr, int len);
-void _GAddress_translate_to(GAddress *address,
-                            struct sockaddr **addr, int *len);
+
+/* 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 */
-void _GAddress_Init_INET(GAddress *address);
+GSocketError _GAddress_Init_INET(GAddress *address);
 /* Local address family */
-void _GAddress_Init_UNIX(GAddress *address);
+GSocketError _GAddress_Init_UNIX(GAddress *address);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif
+    /* wxUSE_SOCKETS */
 
 #endif
+    /* __GSOCK_UNX_H */