guard ABI changes for LFS in apt-inst

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

diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h
index e2063cd716a6430c9eb3acc7919df05c9f7cb29e..f53356847f80156c055c9628602135e9ac5d27aa 100644 (file)
--- a/apt-inst/contrib/arfile.h
+++ b/apt-inst/contrib/arfile.h
@@ -17,7 +17,12 @@
 
 
 #include <string>
+#include <apt-pkg/macros.h>
+#ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/fileutl.h>
+#endif
+
+class FileFd;
 
 class ARArchive
 {
@@ -49,7 +54,7 @@ class ARArchive
 struct ARArchive::Member
 {
    // Fields from the header
-   string Name;
+   std::string Name;
    unsigned long MTime;
    unsigned long UID;
    unsigned long GID;
@@ -57,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) {};