diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-09-14 13:22:19 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-09-14 13:22:19 +0200 |
| commit | a0e07f3ec885c12c733c12805391646c202f3f31 (patch) | |
| tree | faa658f29d7dff42c6ed475037dd462384eab46e /apt-inst/contrib | |
| parent | b11fe392b2245354591296df88c3be2e6218af12 (diff) | |
| parent | afd7b358f94efddb83a2911ec1a21e7280074b1e (diff) | |
merged from lp:~donkult/apt/experimental
Diffstat (limited to 'apt-inst/contrib')
| -rw-r--r-- | apt-inst/contrib/arfile.cc | 5 | ||||
| -rw-r--r-- | apt-inst/contrib/arfile.h | 2 | ||||
| -rw-r--r-- | apt-inst/contrib/extracttar.cc | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc index 8018f4d30..533c563f9 100644 --- a/apt-inst/contrib/arfile.cc +++ b/apt-inst/contrib/arfile.cc @@ -14,13 +14,16 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ +#include<config.h> + #include <apt-pkg/arfile.h> #include <apt-pkg/strutl.h> #include <apt-pkg/error.h> #include <stdlib.h> - /*}}}*/ + #include <apti18n.h> + /*}}}*/ struct ARArchive::MemberHeader { diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h index 7f6c68302..e2063cd71 100644 --- a/apt-inst/contrib/arfile.h +++ b/apt-inst/contrib/arfile.h @@ -54,7 +54,7 @@ struct ARArchive::Member unsigned long UID; unsigned long GID; unsigned long Mode; - unsigned long Size; + unsigned long long Size; // Location of the data. unsigned long Start; diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index 01b6b3836..487027c3d 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -16,8 +16,9 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#include <apt-pkg/extracttar.h> +#include<config.h> +#include <apt-pkg/extracttar.h> #include <apt-pkg/error.h> #include <apt-pkg/strutl.h> #include <apt-pkg/configuration.h> @@ -28,6 +29,7 @@ #include <signal.h> #include <fcntl.h> #include <iostream> + #include <apti18n.h> /*}}}*/ |