fixes for wxFontMapper endless recursion

[wxWidgets.git] / include / wx / sckaddr.h

diff --git a/include/wx/sckaddr.h b/include/wx/sckaddr.h
index 1ea7a599dd91e3b2838718a475cd9302c5e7f521..25ee60d4980ed8783fe70981a81ee6dbb70e7c90 100644 (file)
--- a/include/wx/sckaddr.h
+++ b/include/wx/sckaddr.h
@@ -21,7 +21,7 @@
 #if wxUSE_SOCKETS
 
 #include "wx/string.h"
-#include "gsocket.h"
+#include "wx/gsocket.h"
 
 
 class WXDLLEXPORT wxSockAddress : public wxObject {
@@ -60,9 +60,6 @@ public:
   wxString Hostname();
   unsigned short Service();
 
-  void Build(struct sockaddr*& addr, size_t& len);
-  void Disassemble(struct sockaddr *addr, size_t len);
-
   inline int Type() { return wxSockAddress::IPV4; }
 };
 
@@ -89,7 +86,10 @@ public:
 #endif
 
 #ifdef __UNIX__
-#include <sys/un.h>
+#include <sys/socket.h>
+#ifndef __VMS__
+# include <sys/un.h>
+#endif
 
 class WXDLLEXPORT wxUNIXaddress : public wxSockAddress {
   DECLARE_DYNAMIC_CLASS(wxUNIXaddress)
@@ -109,6 +109,6 @@ public:
 
 #endif
   // wxUSE_SOCKETS
-  
+
 #endif
   // _WX_NETWORK_ADDRESS_H