diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-11-10 16:56:21 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-11-10 16:56:21 +0100 |
| commit | 7cb543fb742a837c4931513674febaec5e4c1401 (patch) | |
| tree | ddefe5b9329907818aa6eb3b593f555b29ccb869 /apt-inst/contrib/arfile.h | |
| parent | f6cb0880a4b5d31e398cceb2e2577b6b82f4fffb (diff) | |
| parent | 71ecaad29d8066a494f516efc5efd80860653fe2 (diff) | |
merged from lp:~mvo/apt/mvo (that has all the changes from debian-experimental2) and resolved a bunch of conflicts
Diffstat (limited to 'apt-inst/contrib/arfile.h')
| -rw-r--r-- | apt-inst/contrib/arfile.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h index 7f6c68302..2be1323d1 100644 --- a/apt-inst/contrib/arfile.h +++ b/apt-inst/contrib/arfile.h @@ -17,7 +17,8 @@ #include <string> -#include <apt-pkg/fileutl.h> + +class FileFd; class ARArchive { @@ -49,12 +50,12 @@ class ARArchive 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 Size; + unsigned long long Size; // Location of the data. unsigned long Start; |