corrected conditional compilation for Darwin / Mac OS X

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/sckaddr.h b/include/wx/sckaddr.h
index c9be201e8ec28a9c4a15e05376392516e0de5dab..ab0f989e81be4c119de7a12bb0dd4dea804c5638 100644 (file)
--- a/include/wx/sckaddr.h
+++ b/include/wx/sckaddr.h
@@ -101,7 +101,7 @@ public:
 };
 #endif
 
-#if defined(__UNIX__) && !defined(__WXMAC__)
+#if defined(__UNIX__) && (!defined(__WXMAC__) || defined(__DARWIN__))
 #include <sys/socket.h>
 #ifndef __VMS__
 # include <sys/un.h>

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index 1cfa463c864d003b59bb953329dde1ea8083500c..ff8739c79dc340adbff69ad42faf1d16e40959da 100644 (file)
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -46,7 +46,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress)
 #ifdef ENABLE_IPV6
 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress)
 #endif
-#if defined(__UNIX__) && !defined(__WXMAC__)
+#if defined(__UNIX__) && (!defined(__WXMAC__) || defined(__DARWIN__))
 IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif
 
@@ -71,6 +71,7 @@ wxSockAddress::wxSockAddress()
 }
 
 wxSockAddress::wxSockAddress(const wxSockAddress& other)
+    : wxObject()
 {
     Init();
 
@@ -236,7 +237,7 @@ unsigned short wxIPV6address::Service()
 
 #endif // 0
 
-#if defined(__UNIX__) && !defined(__WXMAC__)
+#if defined(__UNIX__) && (!defined(__WXMAC__) || defined(__DARWIN__))
 
 // ---------------------------------------------------------------------------
 // wxUNIXaddress