From 01babda34e075c537b7b6360888b2e536847adfb Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Wed, 8 May 2002 13:19:14 +0000 Subject: [PATCH] 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 --- include/wx/sckaddr.h | 2 +- src/common/sckaddr.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/wx/sckaddr.h b/include/wx/sckaddr.h index c9be201e8e..ab0f989e81 100644 --- 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 #ifndef __VMS__ # include diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp index 1cfa463c86..ff8739c79d 100644 --- 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 -- 2.45.2