diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-12-19 14:07:51 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-12-19 14:07:51 +0100 |
| commit | 27da8141d21cfbfc29675510737ee05bdfd4a2b1 (patch) | |
| tree | 008e311e4c24dbfce3f47643d962cfa67a333a68 /apt-inst | |
| parent | 386566e36bedb453eb6f914e8e14fd555a2bf111 (diff) | |
| parent | 6fd947bd48449652edf783cfb1362391e63f9be1 (diff) | |
merged from lp:~donkult/apt/experimental
Diffstat (limited to 'apt-inst')
| -rw-r--r-- | apt-inst/contrib/arfile.h | 3 | ||||
| -rw-r--r-- | apt-inst/contrib/extracttar.h | 6 | ||||
| -rw-r--r-- | apt-inst/database.h | 4 | ||||
| -rw-r--r-- | apt-inst/deb/debfile.h | 4 |
4 files changed, 17 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 diff --git a/apt-inst/database.h b/apt-inst/database.h index ccfee3797..64e149f98 100644 --- a/apt-inst/database.h +++ b/apt-inst/database.h @@ -25,6 +25,10 @@ #include <string> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/filelist.h> +#endif + class pkgFLCache; class OpProgress; diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h index 2c4734f9e..5e1ea1d2f 100644 --- a/apt-inst/deb/debfile.h +++ b/apt-inst/deb/debfile.h @@ -29,6 +29,10 @@ #include <apt-pkg/tagfile.h> #include <apt-pkg/pkgcache.h> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/database.h> +#endif + class FileFd; class pkgDataBase; |