X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b92fd37cb0f0d68b33d00abf696d0c3583bd8423..7018409531500bd1850c1ab3f0107007802bbc5a:/src/common/ftp.cpp

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 23aad6bf51..95d0d739d5 100644
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -50,7 +50,7 @@
 #include "wx/protocol/ftp.h"
 
 #if defined(__WXMAC__)
-    #include "/wx/mac/macsock.h"
+    #include "wx/mac/macsock.h"
 #endif
 
 #ifndef __MWERKS__
@@ -365,8 +365,8 @@ bool wxFTP::SetTransferMode(TransferMode transferMode)
 
     if ( !DoSimpleCommand(_T("TYPE"), mode) )
     {
-        wxLogError(_("Failed to set FTP transfer mode to %s."),
-                   transferMode == ASCII ? _("ASCII") : _("binary"));
+        wxLogError(_("Failed to set FTP transfer mode to %s."), (const wxChar*)
+                   (transferMode == ASCII ? _("ASCII") : _("binary")));
 
         return FALSE;
     }
@@ -571,7 +571,7 @@ wxSocketClient *wxFTP::GetPort()
         return NULL;
     }
 
-    const char *addrStart = wxStrchr(m_lastResult, _T('('));
+    const wxChar *addrStart = wxStrchr(m_lastResult, _T('('));
     if ( !addrStart )
     {
         m_lastError = wxPROTO_PROTERR;
@@ -579,7 +579,7 @@ wxSocketClient *wxFTP::GetPort()
         return NULL;
     }
 
-    const char *addrEnd = wxStrchr(addrStart, _T(')'));
+    const wxChar *addrEnd = wxStrchr(addrStart, _T(')'));
     if ( !addrEnd )
     {
         m_lastError = wxPROTO_PROTERR;