merged r1970 lp:~vorlon/apt/lp.968828

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

diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h
index 7f6c683024a3a36d5ea87eda0fcec972e16f3416..0f62a34a06bd41025bb88c9c1013c7fcccc3fa3e 100644 (file)
--- a/apt-inst/contrib/arfile.h
+++ b/apt-inst/contrib/arfile.h
@@ -17,7 +17,11 @@
 
 
 #include <string>
 
 
 #include <string>

+#ifndef APT_8_CLEANER_HEADERS

 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/fileutl.h>

+#endif
+
+class FileFd;

 
 class ARArchive
 {
 
 class ARArchive
 {


@@ -49,12 +53,12 @@ class ARArchive
 struct ARArchive::Member
 {
    // Fields from the header
 struct ARArchive::Member
 {
    // Fields from the header

-   string Name;
+   std::string Name;

    unsigned long MTime;
    unsigned long UID;
    unsigned long GID;
    unsigned long Mode;
    unsigned long MTime;
    unsigned long UID;
    unsigned long GID;
    unsigned long Mode;

-   unsigned long Size;
+   unsigned long long Size;

    
    // Location of the data.
    unsigned long Start;
    
    // Location of the data.
    unsigned long Start;