[sword-svn] r2822 - in trunk: include src/mgr

[scribe at crosswire.org]

Author: scribe
Date: 2013-06-15 02:51:00 -0700 (Sat, 15 Jun 2013)
New Revision: 2822

Modified:
   trunk/include/ftplib.h
   trunk/src/mgr/ftplibftpt.cpp
Log:
Applied patch to fix ftplibremotetransport to use the renamed RemoteTransport class (GHellings)


Modified: trunk/include/ftplib.h
===================================================================
--- trunk/include/ftplib.h	2013-06-14 07:21:03 UTC (rev 2821)
+++ trunk/include/ftplib.h	2013-06-15 09:51:00 UTC (rev 2822)
@@ -23,10 +23,11 @@
 #if !defined(__FTPLIB_H)
 #define __FTPLIB_H
 
+#ifndef _FTPLIB_NO_COMPAT
 #define _FTPLIB_NO_COMPAT
+#endif
 
 
-
 #if defined(__unix__) || defined(VMS)
 #define GLOBALDEF
 #define GLOBALREF extern

Modified: trunk/src/mgr/ftplibftpt.cpp
===================================================================
--- trunk/src/mgr/ftplibftpt.cpp	2013-06-14 07:21:03 UTC (rev 2821)
+++ trunk/src/mgr/ftplibftpt.cpp	2013-06-15 09:51:00 UTC (rev 2822)
@@ -76,7 +76,7 @@
 }
 
 
-FTPLibFTPTransport::FTPLibFTPTransport(const char *host, StatusReporter *sr) : FTPTransport(host, sr) {
+FTPLibFTPTransport::FTPLibFTPTransport(const char *host, StatusReporter *sr) : RemoteTransport(host, sr) {
 
 	ftpConnection = 0;
 }