X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b5f3fe655deeb91d5d3abe8fad30c4a1cae63dc..a994f81b947bd6ec0e7611988b3ebc1ae3e9df5a:/src/common/ftp.cpp

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 5d1731ad77..28aad19f7f 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;