diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-04-01 12:28:56 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-04-01 12:28:56 +0200 |
| commit | be20eef52da4b7f361333ea70a8d705a98ae779e (patch) | |
| tree | 4177a110ce6b1335fc4b85d5e53b298a65661f39 /apt-private/private-cachefile.cc | |
| parent | a555cf8be53d8b5557f004ecbde8482a169b79f3 (diff) | |
| parent | 21b3eac8f9ab8e12b43fa8998a5aa5465f29adc5 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-manpage
Conflicts:
cmdline/apt.cc
Diffstat (limited to 'apt-private/private-cachefile.cc')
| -rw-r--r-- | apt-private/private-cachefile.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/apt-private/private-cachefile.cc b/apt-private/private-cachefile.cc index c822b9bad..5e955ac39 100644 --- a/apt-private/private-cachefile.cc +++ b/apt-private/private-cachefile.cc @@ -4,11 +4,17 @@ #include <apt-pkg/algorithms.h> #include <apt-pkg/upgrade.h> #include <apt-pkg/error.h> +#include <apt-pkg/configuration.h> +#include <apt-pkg/depcache.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> -#include <cstdlib> +#include <apt-private/private-output.h> +#include <apt-private/private-cachefile.h> -#include "private-output.h" -#include "private-cachefile.h" +#include <string.h> +#include <ostream> +#include <cstdlib> #include <apti18n.h> /*}}}*/ |