Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

corrected conditional compilation for Darwin / Mac OS X

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2002-05-08 13:19:14 +00:00
parent 5e472c1f9f
commit 01babda34e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/sckaddr.h
View File

@@ -101,7 +101,7 @@ public:
}; };
#endif #endif
#if defined(__UNIX__) && !defined(__WXMAC__) #if defined(__UNIX__) && (!defined(__WXMAC__) || defined(__DARWIN__))
#include <sys/socket.h> #include <sys/socket.h>
#ifndef __VMS__ #ifndef __VMS__
# include <sys/un.h> # include <sys/un.h>

5
src/common/sckaddr.cpp
View File

@@ -46,7 +46,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress)
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress) IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress)
#endif #endif
#if defined(__UNIX__) && !defined(__WXMAC__) #if defined(__UNIX__) && (!defined(__WXMAC__) || defined(__DARWIN__))
IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress) IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
#endif #endif
@@ -71,6 +71,7 @@ wxSockAddress::wxSockAddress()
} }
wxSockAddress::wxSockAddress(const wxSockAddress& other) wxSockAddress::wxSockAddress(const wxSockAddress& other)
: wxObject()
{ {
Init(); Init();
@@ -236,7 +237,7 @@ unsigned short wxIPV6address::Service()
#endif // 0 #endif // 0
#if defined(__UNIX__) && !defined(__WXMAC__) #if defined(__UNIX__) && (!defined(__WXMAC__) || defined(__DARWIN__))
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// wxUNIXaddress // wxUNIXaddress