Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental

[apt.git] / methods / rsh.h

diff --git a/methods/rsh.h b/methods/rsh.h
index 7bebe29a095d1365ad868a8079b10ffef4986282..dd259e7442caf7b00cc2658ab003260f94f9edee 100644 (file)
--- a/methods/rsh.h
+++ b/methods/rsh.h
@@ -11,10 +11,12 @@
 #define APT_RSH_H
 
 #include <string>
 #define APT_RSH_H
 
 #include <string>

+#include <time.h>
+

 #include <apt-pkg/strutl.h>
 #include <apt-pkg/strutl.h>

-#include <apt-pkg/hashes.h>
-#include <apt-pkg/acquire-method.h>
-#include <apt-pkg/fileutl.h>
+
+class Hashes;
+class FileFd;

 
 class RSHConn
 {
 
 class RSHConn
 {


@@ -50,6 +52,8 @@ class RSHConn
    ~RSHConn();
 };
 
    ~RSHConn();
 };
 

+#include <apt-pkg/acquire-method.h>
+

 class RSHMethod : public pkgAcqMethod
 {
    virtual bool Fetch(FetchItem *Itm);
 class RSHMethod : public pkgAcqMethod
 {
    virtual bool Fetch(FetchItem *Itm);


@@ -60,7 +64,7 @@ class RSHMethod : public pkgAcqMethod
    static std::string FailFile;
    static int FailFd;
    static time_t FailTime;
    static std::string FailFile;
    static int FailFd;
    static time_t FailTime;

-   static void SigTerm(int);
+   static APT_NORETURN void SigTerm(int);

 
    public:
 
 
    public: