diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-11-10 16:56:21 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-11-10 16:56:21 +0100 |
| commit | 7cb543fb742a837c4931513674febaec5e4c1401 (patch) | |
| tree | ddefe5b9329907818aa6eb3b593f555b29ccb869 /methods/connect.h | |
| parent | f6cb0880a4b5d31e398cceb2e2577b6b82f4fffb (diff) | |
| parent | 71ecaad29d8066a494f516efc5efd80860653fe2 (diff) | |
merged from lp:~mvo/apt/mvo (that has all the changes from debian-experimental2) and resolved a bunch of conflicts
Diffstat (limited to 'methods/connect.h')
| -rw-r--r-- | methods/connect.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/methods/connect.h b/methods/connect.h index 6f208e31d..bbe1bb35d 100644 --- a/methods/connect.h +++ b/methods/connect.h @@ -11,9 +11,10 @@ #define CONNECT_H #include <string> -#include <apt-pkg/acquire-method.h> -bool Connect(string To,int Port,const char *Service,int DefPort, +class pkgAcqMethod; + +bool Connect(std::string To,int Port,const char *Service,int DefPort, int &Fd,unsigned long TimeOut,pkgAcqMethod *Owner); void RotateDNS(); |