X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19ae5cf071340a670f8ad4e808aff1657c648c5c..037267e1560a48434bd4e553389c679283500f1c:/src/common/ftp.cpp

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 00d44539cd..505a923011 100644
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -20,7 +20,13 @@
 #pragma hdrstop
 #endif
 
+#ifndef __MWERKS__
 #include <memory.h>
+#endif
+#if defined(__WXMAC__)
+#include "/wx/mac/macsock.h"
+#endif
+
 #include <stdlib.h>
 #include "wx/string.h"
 #include "wx/utils.h"
@@ -74,7 +80,7 @@ wxFTP::~wxFTP()
 ////////////////////////////////////////////////////////////////
 ////// wxFTP connect and login methods /////////////////////////
 ////////////////////////////////////////////////////////////////
-bool wxFTP::Connect(wxSockAddress& addr)
+bool wxFTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
 {
   if (!m_handler) {
     m_lastError = wxPROTO_NOHNDLR;
@@ -158,12 +164,12 @@ bool wxFTP::GetResult(char exp)
 {
   if ((m_lastError = GetLine(this, m_lastResult)))
     return FALSE;
-  if (m_lastResult[0] != exp) {
+  if (m_lastResult.GetChar(0) != exp) {
     m_lastError = wxPROTO_PROTERR;
     return FALSE;
   }
 
-  if (m_lastResult[3] == '-') {
+  if (m_lastResult.GetChar(3) == '-') {
     wxString key = m_lastResult.Left((size_t)3);
 
     key += ' ';
@@ -322,6 +328,7 @@ bool wxFTP::Abort(void)
 wxInputStream *wxFTP::GetInputStream(const wxString& path)
 {
   wxString tmp_str;
+  size_t calc_size;
 
   if (!SendCommand("TYPE I", '2'))
     return NULL;