diff options
| author | Michael Vogt <mvo@debian.org> | 2014-06-12 08:36:58 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-06-12 08:36:58 +0200 |
| commit | cfc7f735774ba30dbee1897248f8dfedf0229a4c (patch) | |
| tree | b4e0ac29a6b398045a803e890f5cdabcca189d6a /methods/ftp.h | |
| parent | a0187f0f82a184b850b05b62e5a59b6a2055a506 (diff) | |
| parent | 7701680af12a2c1a65121533c6ebcd635c013c25 (diff) | |
Merge tag '1.0.1ubuntu2' into ubuntu/trusty
Conflicts:
configure.ac
debian/changelog
debian/control
test/integration/framework
Diffstat (limited to 'methods/ftp.h')
| -rw-r--r-- | methods/ftp.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/methods/ftp.h b/methods/ftp.h index 8055c389f..dd92f0086 100644 --- a/methods/ftp.h +++ b/methods/ftp.h @@ -12,6 +12,8 @@ #include <apt-pkg/strutl.h> +#include <sys/types.h> +#include <time.h> #include <string> class FTPConn @@ -76,7 +78,7 @@ class FtpMethod : public pkgAcqMethod static std::string FailFile; static int FailFd; static time_t FailTime; - static void SigTerm(int); + static APT_NORETURN void SigTerm(int); public: |