Trying to hide evidence of my negative programming skills...

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

diff --git a/include/wx/sckaddr.h b/include/wx/sckaddr.h
index 74f0c57a35d2a49120f44f06a0b94c9341ffb56d..17a9477905bb2c2e4b496eeff69f79e03f97902c 100644 (file)
--- a/include/wx/sckaddr.h
+++ b/include/wx/sckaddr.h
@@ -56,13 +56,11 @@ public:
   bool Service(const wxString& name);
   bool Service(unsigned short port);
   bool LocalHost();
   bool Service(const wxString& name);
   bool Service(unsigned short port);
   bool LocalHost();

+  bool AnyAddress();

 
   wxString Hostname();
   unsigned short Service();
 
 
   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; }
 };
 
   inline int Type() { return wxSockAddress::IPV4; }
 };
 


@@ -88,9 +86,11 @@ public:
 };
 #endif
 
 };
 #endif
 

-#ifdef __UNIX__
+#if defined(__UNIX__) && !defined(__APPLE__)

 #include <sys/socket.h>
 #include <sys/socket.h>

-#include <sys/un.h>
+#ifndef __VMS__
+# include <sys/un.h>
+#endif

 
 class WXDLLEXPORT wxUNIXaddress : public wxSockAddress {
   DECLARE_DYNAMIC_CLASS(wxUNIXaddress)
 
 class WXDLLEXPORT wxUNIXaddress : public wxSockAddress {
   DECLARE_DYNAMIC_CLASS(wxUNIXaddress)