From: Gilles Depeyrot Date: Fri, 3 May 2002 20:24:06 +0000 (+0000) Subject: corrected conditional compilation for Darwin X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/27af32803aa2574fa41d4a233552cb603909915d corrected conditional compilation for Darwin git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp index 26fc932862..3fb0ef3115 100644 --- a/src/unix/dialup.cpp +++ b/src/unix/dialup.cpp @@ -651,7 +651,7 @@ wxDialUpManagerImpl::CheckIfconfig() { static const wxChar *ifconfigLocations[] = { - _T("/sbin"), // Linux, FreeBSD + _T("/sbin"), // Linux, FreeBSD, Darwin _T("/usr/sbin"), // SunOS, Solaris, AIX, HP-UX _T("/usr/etc"), // IRIX }; @@ -684,7 +684,7 @@ wxDialUpManagerImpl::CheckIfconfig() cmd << " -a"; #elif defined(__LINUX__) || defined(__SGI__) // nothing to be added to ifconfig -#elif defined(__FREEBSD__) || defined(__WXMAC__) +#elif defined(__FREEBSD__) || defined(__DARWIN__) // add -l flag cmd << " -l"; #elif defined(__HPUX__) @@ -785,7 +785,7 @@ wxDialUpManagerImpl::NetConnection wxDialUpManagerImpl::CheckPing() cmd << m_PingPath << ' '; #if defined(__SOLARIS__) || defined (__SUNOS__) // nothing to add to ping command -#elif defined(__LINUX__) || defined ( __FREEBSD__) || defined(__WXMAC__) || defined( __VMS ) +#elif defined(__LINUX__) || defined ( __FREEBSD__) || defined(__DARWIN__) || defined( __VMS ) cmd << "-c 1 "; // only ping once #elif defined(__HPUX__) cmd << "64 1 "; // only ping once (need also specify the packet size)