summaryrefslogtreecommitdiff
path: root/apt-inst/contrib/arfile.h
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2015-08-18 11:54:05 +0200
committerMichael Vogt <mvo@debian.org>2015-08-18 11:54:05 +0200
commit21248c0f00ee71412dbadc6ebf84011cf974346d (patch)
tree7dc1f5904399482d2128765b5b86d57a4ac5b3e1 /apt-inst/contrib/arfile.h
parente5f34ad3b043abf033c1626eb8449b75955d6760 (diff)
parent4fc6b7570c3e97b65c118b58cdf6729fa94c9b03 (diff)
Merge branch 'debian/experimental' into feature/srv-records
Conflicts: cmdline/apt-helper.cc cmdline/makefile
Diffstat (limited to 'apt-inst/contrib/arfile.h')
-rw-r--r--apt-inst/contrib/arfile.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h
index 0f62a34a0..f53356847 100644
--- a/apt-inst/contrib/arfile.h
+++ b/apt-inst/contrib/arfile.h
@@ -17,6 +17,7 @@
#include <string>
+#include <apt-pkg/macros.h>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/fileutl.h>
#endif
@@ -61,7 +62,11 @@ struct ARArchive::Member
unsigned long long Size;
// Location of the data.
+#if APT_PKG_ABI >= 413
+ unsigned long long Start;
+#else
unsigned long Start;
+#endif
Member *Next;
Member() : Start(0), Next(0) {};