PPP interface under IRIX is called 'ppp'

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp
index 1d00eb337b8c94f4ad8fd29616126b02986b4bbc..bc398566677e3ca8b108f284aa3953858dad20e1 100644 (file)
--- a/src/unix/dialup.cpp
+++ b/src/unix/dialup.cpp
@@ -494,10 +494,10 @@ wxDialUpManagerImpl::CheckIfconfig(void)
 #if defined(__SOLARIS__) || defined (__SUNOS__)
       // need to add -a flag
       cmd << " -a";
-#elif defined(__LINUX__) || defined (__FREEBSD__)
+#elif defined(__LINUX__) || defined (__FREEBSD__) || defined(__SGI__)
       // nothing to be added to ifconfig
 #else
-#   pragma warning "No ifconfig information for this OS."
+#     pragma warning "No ifconfig information for this OS."
       m_CanUseIfconfig = 0;
       return -1;
 #endif
@@ -516,20 +516,18 @@ wxDialUpManagerImpl::CheckIfconfig(void)
             output[file.Length()] = '\0';
             if(file.Read(output,file.Length()) == file.Length())
             {
-               if(
+               // FIXME shouldn't we grep for "^ppp"? (VZ)
+
 #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__)
-                  strstr(output,"ppp")   // ppp
-                  || strstr(output,"sl") // slip
-                  || strstr(output,"pl") // plip
-#else
-                  FALSE
+               rc = strstr(output,"ppp")   // ppp
+                    || strstr(output,"sl") // slip
+                    || strstr(output,"pl") // plip
+#elif defined(__SGI__)  // IRIX
+               rc = strstr(output, "ppp"); // PPP
 #endif
-                  )
-                  rc = 1;
-               else
-                  rc = 0;
             }
             file.Close();
             delete [] output;