diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-01-16 22:17:23 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-01-16 22:17:23 +0100 |
| commit | e70c1d067335bfa686fa0c6e75e32afb095e1aaa (patch) | |
| tree | e985e74ed4d613126b24839d710e4b49db753824 /apt-inst/contrib | |
| parent | e75aa33384d52635fba502bed628bc68f9cb5066 (diff) | |
| parent | 85e1885525977809ff6a3b70abb84d3a63e41817 (diff) | |
merged from debian-experimental2
Diffstat (limited to 'apt-inst/contrib')
| -rw-r--r-- | apt-inst/contrib/arfile.h | 3 | ||||
| -rw-r--r-- | apt-inst/contrib/extracttar.h | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h index 2be1323d1..0f62a34a0 100644 --- a/apt-inst/contrib/arfile.h +++ b/apt-inst/contrib/arfile.h @@ -17,6 +17,9 @@ #include <string> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/fileutl.h> +#endif class FileFd; diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h index 8754e8dcc..4b29df314 100644 --- a/apt-inst/contrib/extracttar.h +++ b/apt-inst/contrib/extracttar.h @@ -18,6 +18,12 @@ #include <string> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/dirstream.h> +#include <algorithm> +using std::min; +#endif + class pkgDirStream; class ExtractTar |