From 60b64ffc3468579183abc1bac0179943d782a52e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 7 Nov 2014 14:21:35 +0100 Subject: guard ABI changes for LFS in apt-inst Git-Dch: Ignore --- apt-inst/deb/debfile.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'apt-inst/deb/debfile.h') diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h index b068efcec..9d286716a 100644 --- a/apt-inst/deb/debfile.h +++ b/apt-inst/deb/debfile.h @@ -27,6 +27,7 @@ #include #include #include +#include #include @@ -81,13 +82,20 @@ class debDebFile::MemControlExtract : public pkgDirStream // Members from DirStream virtual bool DoItem(Item &Itm,int &Fd); virtual bool Process(Item &Itm,const unsigned char *Data, +#if APT_PKG_ABI >= 413 unsigned long long Size,unsigned long long Pos); - +#else + unsigned long Size,unsigned long Pos); +#endif // Helpers bool Read(debDebFile &Deb); +#if APT_PKG_ABI >= 413 bool TakeControl(const void *Data,unsigned long long Size); - +#else + bool TakeControl(const void *Data,unsigned long Size); +#endif + MemControlExtract() : IsControl(false), Control(0), Length(0), Member("control") {}; MemControlExtract(std::string Member) : IsControl(false), Control(0), Length(0), Member(Member) {}; ~MemControlExtract() {delete [] Control;}; -- cgit v1.2.3