diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-04-01 12:28:56 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-04-01 12:28:56 +0200 |
| commit | be20eef52da4b7f361333ea70a8d705a98ae779e (patch) | |
| tree | 4177a110ce6b1335fc4b85d5e53b298a65661f39 /methods/rsh.h | |
| parent | a555cf8be53d8b5557f004ecbde8482a169b79f3 (diff) | |
| parent | 21b3eac8f9ab8e12b43fa8998a5aa5465f29adc5 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-manpage
Conflicts:
cmdline/apt.cc
Diffstat (limited to 'methods/rsh.h')
| -rw-r--r-- | methods/rsh.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/methods/rsh.h b/methods/rsh.h index d7efa3f06..dd259e744 100644 --- a/methods/rsh.h +++ b/methods/rsh.h @@ -11,6 +11,8 @@ #define APT_RSH_H #include <string> +#include <time.h> + #include <apt-pkg/strutl.h> class Hashes; @@ -62,7 +64,7 @@ class RSHMethod : public pkgAcqMethod static std::string FailFile; static int FailFd; static time_t FailTime; - static void SigTerm(int); + static APT_NORETURN void SigTerm(int); public: |