oops, compilation fix

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

diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp
index bc398566677e3ca8b108f284aa3953858dad20e1..755919befa33e0027ade7428769eb49ce657ea35 100644 (file)
--- a/src/unix/dialup.cpp
+++ b/src/unix/dialup.cpp
@@ -127,7 +127,7 @@ public:
 
    size_t GetISPNames(class wxArrayString &) const
       { return 0; }
 
    size_t GetISPNames(class wxArrayString &) const
       { return 0; }

-   
+

    // sometimes the built-in logic for determining the online status may fail,
    // so, in general, the user should be allowed to override it. This function
    // allows to forcefully set the online status - whatever our internal
    // sometimes the built-in logic for determining the online status may fail,
    // so, in general, the user should be allowed to override it. This function
    // allows to forcefully set the online status - whatever our internal


@@ -175,7 +175,7 @@ private:
    int m_CanUsePing;
    /// The path to ping program
    wxString m_PingPath;
    int m_CanUsePing;
    /// The path to ping program
    wxString m_PingPath;

-   
+

    /// beacon host:
    wxString m_BeaconHost;
    /// beacon host portnumber for connect:
    /// beacon host:
    wxString m_BeaconHost;
    /// beacon host portnumber for connect:


@@ -209,7 +209,7 @@ private:
    int CheckPing(void);
    /// Check by connecting to host on given port.
    int CheckConnect(void);
    int CheckPing(void);
    /// Check by connecting to host on given port.
    int CheckConnect(void);

-   
+

 };
 
 
 };
 
 


@@ -270,7 +270,7 @@ wxDialUpManagerImpl::wxDialUpManagerImpl()
    wxChar * hup = wxGetenv(_T("WXDIALUP_HUPCMD"));
    if(dial || hup)
       SetConnectCommand(dial ? wxString(dial) : m_ConnectCommand,
    wxChar * hup = wxGetenv(_T("WXDIALUP_HUPCMD"));
    if(dial || hup)
       SetConnectCommand(dial ? wxString(dial) : m_ConnectCommand,

-                        hup ? wxString(hup) : m_HangUpCommand); 
+                        hup ? wxString(hup) : m_HangUpCommand);

 }
 
 wxDialUpManagerImpl::~wxDialUpManagerImpl()
 }
 
 wxDialUpManagerImpl::~wxDialUpManagerImpl()


@@ -443,17 +443,17 @@ wxDialUpManagerImpl::CheckConnect(void)
 
    if((hp = gethostbyname(m_BeaconHost.mb_str())) == NULL)
       return 0; // no DNS no net
 
    if((hp = gethostbyname(m_BeaconHost.mb_str())) == NULL)
       return 0; // no DNS no net

-   
+

    serv_addr.sin_family                = hp->h_addrtype;
    memcpy(&serv_addr.sin_addr,hp->h_addr, hp->h_length);
    serv_addr.sin_port          = htons(m_BeaconPort);
 
    int sockfd;
    serv_addr.sin_family                = hp->h_addrtype;
    memcpy(&serv_addr.sin_addr,hp->h_addr, hp->h_length);
    serv_addr.sin_port          = htons(m_BeaconPort);
 
    int sockfd;

-   if( ( sockfd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) 
-   {   
+   if( ( sockfd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0)
+   {

       return -1;  // no info
    }
       return -1;  // no info
    }

-   
+

    if( connect(sockfd, (struct sockaddr *) &serv_addr,
                sizeof(serv_addr)) >= 0)
    {
    if( connect(sockfd, (struct sockaddr *) &serv_addr,
                sizeof(serv_addr)) >= 0)
    {


@@ -522,9 +522,9 @@ wxDialUpManagerImpl::CheckIfconfig(void)
                // dialup device under SunOS/Solaris
                rc = strstr(output,"ipdptp") != (char *)NULL;
 #elif defined(__LINUX__) || defined (__FREEBSD__)
                // dialup device under SunOS/Solaris
                rc = strstr(output,"ipdptp") != (char *)NULL;
 #elif defined(__LINUX__) || defined (__FREEBSD__)

-               rc = strstr(output,"ppp")   // ppp
-                    || strstr(output,"sl") // slip
-                    || strstr(output,"pl") // plip
+               rc = strstr(output,"ppp")    // ppp
+                    || strstr(output,"sl")  // slip
+                    || strstr(output,"pl"); // plip

 #elif defined(__SGI__)  // IRIX
                rc = strstr(output, "ppp"); // PPP
 #endif
 #elif defined(__SGI__)  // IRIX
                rc = strstr(output, "ppp"); // PPP
 #endif


@@ -546,7 +546,7 @@ wxDialUpManagerImpl::CheckPing(void)
 {
    if(! m_CanUsePing)
       return -1;
 {
    if(! m_CanUsePing)
       return -1;

-   
+

    // First time check for ping location. We only use the variant
    // which does not take arguments, a la GNU.
    if(m_CanUsePing == -1) // unknown
    // First time check for ping location. We only use the variant
    // which does not take arguments, a la GNU.
    if(m_CanUsePing == -1) // unknown