Merge branch 'feature/http-https'

1 files changed, 4 insertions, 3 deletions

diff --git a/methods/ftp.h b/methods/ftp.h
index 6a12475a0..5b23dba41 100644
--- a/methods/ftp.h
+++ b/methods/ftp.h
@@ -10,8 +10,9 @@
 #ifndef APT_FTP_H
 #define APT_FTP_H
 
-#include <apt-pkg/strutl.h>
 #include "aptmethod.h"
+#include "connect.h"
+#include <apt-pkg/strutl.h>
 
 #include <sys/socket.h>
 #include <sys/types.h>
@@ -22,7 +23,7 @@ class FTPConn
 {
    char Buffer[1024*10];
    unsigned long Len;
-   int ServerFd;
+   std::unique_ptr<MethodFd> ServerFd;
    int DataFd;
    int DataListenFd;
    URI ServerName;
@@ -55,7 +56,7 @@ class FTPConn
    bool WriteMsg(unsigned int &Ret,std::string &Text,const char *Fmt,...);
    
    // Connection control
-   bool Open(pkgAcqMethod *Owner);
+   bool Open(aptMethod *Owner);
    void Close();   
    bool GoPasv();
    bool ExtGoPasv();