diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-12-13 01:22:38 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-12-13 01:22:38 +0100 |
| commit | b9dadc24b9477b466bc8058c765d76c65ecc7125 (patch) | |
| tree | b977b473cc50498d6a3a469f54f144daa79c27e2 /apt-pkg/contrib | |
| parent | a4f6bdc8bd91c7282ae9ac60c44844c6f0058a65 (diff) | |
revert 2184.1.3: forward declaration instead of headers
The breakage is just to big for now, so guard the change with
#ifndef APT_8_CLEANER_HEADERS and be nice to library users
Diffstat (limited to 'apt-pkg/contrib')
| -rw-r--r-- | apt-pkg/contrib/cmndline.h | 4 | ||||
| -rw-r--r-- | apt-pkg/contrib/mmap.h | 1 | ||||
| -rw-r--r-- | apt-pkg/contrib/netrc.h | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h index b201d9855..9f505fd41 100644 --- a/apt-pkg/contrib/cmndline.h +++ b/apt-pkg/contrib/cmndline.h @@ -44,6 +44,10 @@ #ifndef PKGLIB_CMNDLINE_H #define PKGLIB_CMNDLINE_H +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/configuration.h> +#endif + class Configuration; class CommandLine diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h index 602de94f8..6bd4a2d86 100644 --- a/apt-pkg/contrib/mmap.h +++ b/apt-pkg/contrib/mmap.h @@ -29,6 +29,7 @@ #include <string> #ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/fileutl.h> using std::string; #endif diff --git a/apt-pkg/contrib/netrc.h b/apt-pkg/contrib/netrc.h index 7b94eba88..5931d4a42 100644 --- a/apt-pkg/contrib/netrc.h +++ b/apt-pkg/contrib/netrc.h @@ -16,6 +16,10 @@ #include <string> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/strutl.h> +#endif + #define DOT_CHAR "." #define DIR_CHAR "/" |