PPP interface under IRIX is called 'ppp'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -494,7 +494,7 @@ wxDialUpManagerImpl::CheckIfconfig(void)
|
|||||||
#if defined(__SOLARIS__) || defined (__SUNOS__)
|
#if defined(__SOLARIS__) || defined (__SUNOS__)
|
||||||
// need to add -a flag
|
// need to add -a flag
|
||||||
cmd << " -a";
|
cmd << " -a";
|
||||||
#elif defined(__LINUX__) || defined (__FREEBSD__)
|
#elif defined(__LINUX__) || defined (__FREEBSD__) || defined(__SGI__)
|
||||||
// nothing to be added to ifconfig
|
// nothing to be added to ifconfig
|
||||||
#else
|
#else
|
||||||
# pragma warning "No ifconfig information for this OS."
|
# pragma warning "No ifconfig information for this OS."
|
||||||
@@ -516,20 +516,18 @@ wxDialUpManagerImpl::CheckIfconfig(void)
|
|||||||
output[file.Length()] = '\0';
|
output[file.Length()] = '\0';
|
||||||
if(file.Read(output,file.Length()) == file.Length())
|
if(file.Read(output,file.Length()) == file.Length())
|
||||||
{
|
{
|
||||||
if(
|
// FIXME shouldn't we grep for "^ppp"? (VZ)
|
||||||
|
|
||||||
#if defined(__SOLARIS__) || defined (__SUNOS__)
|
#if defined(__SOLARIS__) || defined (__SUNOS__)
|
||||||
strstr(output,"ipdptp") // dialup device
|
// dialup device under SunOS/Solaris
|
||||||
|
rc = strstr(output,"ipdptp") != (char *)NULL;
|
||||||
#elif defined(__LINUX__) || defined (__FREEBSD__)
|
#elif defined(__LINUX__) || defined (__FREEBSD__)
|
||||||
strstr(output,"ppp") // ppp
|
rc = strstr(output,"ppp") // ppp
|
||||||
|| strstr(output,"sl") // slip
|
|| strstr(output,"sl") // slip
|
||||||
|| strstr(output,"pl") // plip
|
|| strstr(output,"pl") // plip
|
||||||
#else
|
#elif defined(__SGI__) // IRIX
|
||||||
FALSE
|
rc = strstr(output, "ppp"); // PPP
|
||||||
#endif
|
#endif
|
||||||
)
|
|
||||||
rc = 1;
|
|
||||||
else
|
|
||||||
rc = 0;
|
|
||||||
}
|
}
|
||||||
file.Close();
|
file.Close();
|
||||||
delete [] output;
|
delete [] output;
|
||||||
|
Reference in New Issue
Block a user