don't duplicate SetInitialSocketBuffers()

[wxWidgets.git] / src / common / ftp.cpp

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 6455c2390e278321cb421a3a8a27b6af65ed67fc..909fe668618ce1a0f13b736fcfdb83000a0d1577 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -48,10 +48,6 @@
 #include "wx/protocol/protocol.h"
 #include "wx/protocol/ftp.h"
 
 #include "wx/protocol/protocol.h"
 #include "wx/protocol/ftp.h"
 

-#if defined(__WXMAC__)
-    #include "wx/mac/macsock.h"
-#endif
-

 #ifndef __MWERKS__
     #include <memory.h>
 #endif
 #ifndef __MWERKS__
     #include <memory.h>
 #endif


@@ -111,7 +107,7 @@ wxFTP::~wxFTP()
 // wxFTP connect and login methods
 // ----------------------------------------------------------------------------
 
 // wxFTP connect and login methods
 // ----------------------------------------------------------------------------
 

-bool wxFTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
+bool wxFTP::Connect(const wxSockAddress& addr, bool WXUNUSED(wait))

 {
     if ( !wxProtocol::Connect(addr) )
     {
 {
     if ( !wxProtocol::Connect(addr) )
     {


@@ -687,7 +683,7 @@ wxSocketBase *wxFTP::GetActivePort()
     // addresses because the addrNew has an IP of "0.0.0.0", so we need the
     // value in addrLocal
     wxString port = GetPortCmdArgument(addrLocal, addrNew);
     // addresses because the addrNew has an IP of "0.0.0.0", so we need the
     // value in addrLocal
     wxString port = GetPortCmdArgument(addrLocal, addrNew);

-    if ( !DoSimpleCommand(_T("PORT "), port) )
+    if ( !DoSimpleCommand(_T("PORT"), port) )

     {
         m_lastError = wxPROTO_PROTERR;
         delete sockSrv;
     {
         m_lastError = wxPROTO_PROTERR;
         delete sockSrv;