Merge branch 'debian/sid' into debian/experimental

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

diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h
index bfc128acea405dd1fed0c6330853df0f30a3a293..5aa38aedcdefe1e58a7597b8bb115879ace1dca7 100644 (file)
--- a/apt-inst/contrib/arfile.h
+++ b/apt-inst/contrib/arfile.h
@@ -17,7 +17,11 @@
 
 
 #include <string>
+#ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/fileutl.h>
+#endif
+
+class FileFd;
 
 class ARArchive
 {
@@ -57,7 +61,7 @@ struct ARArchive::Member
    unsigned long long Size;
    
    // Location of the data.
-   unsigned long Start;
+   unsigned long long Start;
    Member *Next;
    
    Member() : Start(0), Next(0) {};