corrected conditional compilation for Darwin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -651,7 +651,7 @@ wxDialUpManagerImpl::CheckIfconfig()
|
|||||||
{
|
{
|
||||||
static const wxChar *ifconfigLocations[] =
|
static const wxChar *ifconfigLocations[] =
|
||||||
{
|
{
|
||||||
_T("/sbin"), // Linux, FreeBSD
|
_T("/sbin"), // Linux, FreeBSD, Darwin
|
||||||
_T("/usr/sbin"), // SunOS, Solaris, AIX, HP-UX
|
_T("/usr/sbin"), // SunOS, Solaris, AIX, HP-UX
|
||||||
_T("/usr/etc"), // IRIX
|
_T("/usr/etc"), // IRIX
|
||||||
};
|
};
|
||||||
@@ -684,7 +684,7 @@ wxDialUpManagerImpl::CheckIfconfig()
|
|||||||
cmd << " -a";
|
cmd << " -a";
|
||||||
#elif defined(__LINUX__) || defined(__SGI__)
|
#elif defined(__LINUX__) || defined(__SGI__)
|
||||||
// nothing to be added to ifconfig
|
// nothing to be added to ifconfig
|
||||||
#elif defined(__FREEBSD__) || defined(__WXMAC__)
|
#elif defined(__FREEBSD__) || defined(__DARWIN__)
|
||||||
// add -l flag
|
// add -l flag
|
||||||
cmd << " -l";
|
cmd << " -l";
|
||||||
#elif defined(__HPUX__)
|
#elif defined(__HPUX__)
|
||||||
@@ -785,7 +785,7 @@ wxDialUpManagerImpl::NetConnection wxDialUpManagerImpl::CheckPing()
|
|||||||
cmd << m_PingPath << ' ';
|
cmd << m_PingPath << ' ';
|
||||||
#if defined(__SOLARIS__) || defined (__SUNOS__)
|
#if defined(__SOLARIS__) || defined (__SUNOS__)
|
||||||
// nothing to add to ping command
|
// 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
|
cmd << "-c 1 "; // only ping once
|
||||||
#elif defined(__HPUX__)
|
#elif defined(__HPUX__)
|
||||||
cmd << "64 1 "; // only ping once (need also specify the packet size)
|
cmd << "64 1 "; // only ping once (need also specify the packet size)
|
||||||
|
Reference in New Issue
Block a user