Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-inst / contrib / extracttar.h

diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h
index 8754e8dcc0166399c438dc2af20dcb3aaef929a4..472e018f4d3c18eb30a98c493ee2d610dd1e69c6 100644 (file)
--- a/apt-inst/contrib/extracttar.h
+++ b/apt-inst/contrib/extracttar.h
@@ -18,6 +18,12 @@
 
 #include <string>
 
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/dirstream.h>
+#include <algorithm>
+using std::min;
+#endif
+
 class pkgDirStream;
 
 class ExtractTar
@@ -33,7 +39,7 @@ class ExtractTar
                   GNU_LongLink = 'K',GNU_LongName = 'L'};
 
    FileFd &File;
-   unsigned long MaxInSize;
+   unsigned long long MaxInSize;
    int GZPid;
    FileFd InFd;
    bool Eof;
@@ -47,7 +53,7 @@ class ExtractTar
 
    bool Go(pkgDirStream &Stream);
    
-   ExtractTar(FileFd &Fd,unsigned long Max,std::string DecompressionProgram);
+   ExtractTar(FileFd &Fd,unsigned long long Max,std::string DecompressionProgram);
    virtual ~ExtractTar();
 };