X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/484dbb814fd2b787b2206ffe9504798dfd73ae6c..2853201580944cb4e5a2a8a810e800e89e9a0475:/apt-inst/contrib/extracttar.h

diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h
index 42f8ef534..edd3cec8e 100644
--- a/apt-inst/contrib/extracttar.h
+++ b/apt-inst/contrib/extracttar.h
@@ -15,11 +15,17 @@
 #define PKGLIB_EXTRACTTAR_H
 
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/dirstream.h>
+#include <apt-pkg/macros.h>
 
-#include <algorithm>
+#include <string>
 
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/dirstream.h>
+#include <algorithm>
 using std::min;
+#endif
+
+class pkgDirStream;
 
 class ExtractTar
 {
@@ -34,21 +40,22 @@ class ExtractTar
                   GNU_LongLink = 'K',GNU_LongName = 'L'};
 
    FileFd &File;
-   unsigned long MaxInSize;
+   unsigned long long MaxInSize;
    int GZPid;
    FileFd InFd;
    bool Eof;
-   string DecompressProg;
+   std::string DecompressProg;
    
    // Fork and reap gzip
    bool StartGzip();
-   bool Done(bool Force);
-   
+   bool Done();
+   APT_DEPRECATED_MSG("Parameter Force is ignored, use Done() instead.") bool Done(bool Force);
+
    public:
 
    bool Go(pkgDirStream &Stream);
-   
-   ExtractTar(FileFd &Fd,unsigned long Max,string DecompressionProgram);
+
+   ExtractTar(FileFd &Fd,unsigned long long Max,std::string DecompressionProgram);
    virtual ~ExtractTar();
 };