diff options
| author | Michael Vogt <mvo@debian.org> | 2015-08-18 11:54:05 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2015-08-18 11:54:05 +0200 |
| commit | 21248c0f00ee71412dbadc6ebf84011cf974346d (patch) | |
| tree | 7dc1f5904399482d2128765b5b86d57a4ac5b3e1 /apt-inst/contrib/extracttar.h | |
| parent | e5f34ad3b043abf033c1626eb8449b75955d6760 (diff) | |
| parent | 4fc6b7570c3e97b65c118b58cdf6729fa94c9b03 (diff) | |
Merge branch 'debian/experimental' into feature/srv-records
Conflicts:
cmdline/apt-helper.cc
cmdline/makefile
Diffstat (limited to 'apt-inst/contrib/extracttar.h')
| -rw-r--r-- | apt-inst/contrib/extracttar.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h index 4b29df314..57be956bd 100644 --- a/apt-inst/contrib/extracttar.h +++ b/apt-inst/contrib/extracttar.h @@ -15,6 +15,7 @@ #define PKGLIB_EXTRACTTAR_H #include <apt-pkg/fileutl.h> +#include <apt-pkg/macros.h> #include <string> @@ -39,7 +40,11 @@ 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; @@ -52,8 +57,12 @@ class ExtractTar public: bool Go(pkgDirStream &Stream); - + +#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(); }; |