diff options
| author | Michael Vogt <mvo@debian.org> | 2015-06-23 12:17:35 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2015-06-23 12:17:35 +0100 |
| commit | 245dde96193702f7f51389d3583dee547f8ba366 (patch) | |
| tree | 6cf8c191641c760bcc6a6c08fb0ff65d27e0cffd /apt-inst/dirstream.h | |
| parent | 5530255b5f3ad7de2e23dfcb39ce325001126501 (diff) | |
| parent | c8a4ce6cbed57ae108dc955d4a850f9b129a0693 (diff) | |
Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental
Diffstat (limited to 'apt-inst/dirstream.h')
| -rw-r--r-- | apt-inst/dirstream.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/apt-inst/dirstream.h b/apt-inst/dirstream.h index 571fe86a5..53ac24ba5 100644 --- a/apt-inst/dirstream.h +++ b/apt-inst/dirstream.h @@ -25,6 +25,7 @@ #ifndef PKGLIB_DIRSTREAM_H #define PKGLIB_DIRSTREAM_H +#include <apt-pkg/macros.h> class pkgDirStream { @@ -37,10 +38,15 @@ class pkgDirStream Directory, FIFO} Type; char *Name; char *LinkTarget; +#if APT_PKG_ABI >= 413 unsigned long long Size; +#endif unsigned long Mode; unsigned long UID; unsigned long GID; +#if APT_PKG_ABI < 413 + unsigned long Size; +#endif unsigned long MTime; unsigned long Major; unsigned long Minor; @@ -49,9 +55,13 @@ class pkgDirStream virtual bool DoItem(Item &Itm,int &Fd); virtual bool Fail(Item &Itm,int Fd); virtual bool FinishedFile(Item &Itm,int Fd); +#if APT_PKG_ABI >= 413 virtual bool Process(Item &/*Itm*/,const unsigned char * /*Data*/, unsigned long long /*Size*/,unsigned long long /*Pos*/) {return true;}; - +#else + virtual bool Process(Item &/*Itm*/,const unsigned char * /*Data*/, + unsigned long /*Size*/,unsigned long /*Pos*/) {return true;}; +#endif virtual ~pkgDirStream() {}; }; |