Merge branch 'debian/experimental' into feature/srv-records

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

diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h
index 6daf00a275f4793dccce69015b74fcc2d6beb8c3..57be956bd0649fe6b0b54292374dbd65fe9570e5 100644 (file)
--- a/apt-inst/contrib/extracttar.h
+++ b/apt-inst/contrib/extracttar.h
@@ -14,16 +14,18 @@
 #ifndef PKGLIB_EXTRACTTAR_H
 #define PKGLIB_EXTRACTTAR_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/extracttar.h"
-#endif
-
 #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
 {
@@ -38,11 +40,15 @@ class ExtractTar
                   GNU_LongLink = 'K',GNU_LongName = 'L'};
 
    FileFd &File;
+#if APT_PKG_ABI >= 413
+   unsigned long long MaxInSize;
+#else
    unsigned long MaxInSize;
+#endif
    int GZPid;
    FileFd InFd;
    bool Eof;
-   string DecompressProg;
+   std::string DecompressProg;
    
    // Fork and reap gzip
    bool StartGzip();
@@ -51,8 +57,12 @@ class ExtractTar
    public:
 
    bool Go(pkgDirStream &Stream);
-   
-   ExtractTar(FileFd &Fd,unsigned long Max,string DecompressionProgram);
+
+#if APT_PKG_ABI >= 413
+   ExtractTar(FileFd &Fd,unsigned long long Max,std::string DecompressionProgram);
+#else
+   ExtractTar(FileFd &Fd,unsigned long Max,std::string DecompressionProgram);
+#endif
    virtual ~ExtractTar();
 };