summaryrefslogtreecommitdiff
path: root/apt-inst
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2011-12-13 01:22:38 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2011-12-13 01:22:38 +0100
commitb9dadc24b9477b466bc8058c765d76c65ecc7125 (patch)
treeb977b473cc50498d6a3a469f54f144daa79c27e2 /apt-inst
parenta4f6bdc8bd91c7282ae9ac60c44844c6f0058a65 (diff)
downloadapt-b9dadc24b9477b466bc8058c765d76c65ecc7125.tar.gz
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-inst')
-rw-r--r--apt-inst/contrib/arfile.h3
-rw-r--r--apt-inst/contrib/extracttar.h2
-rw-r--r--apt-inst/database.h4
-rw-r--r--apt-inst/deb/debfile.h4
4 files changed, 13 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 e104417c1..4b29df314 100644
--- a/apt-inst/contrib/extracttar.h
+++ b/apt-inst/contrib/extracttar.h
@@ -19,6 +19,8 @@
#include <string>
#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/dirstream.h>
+#include <algorithm>
using std::min;
#endif
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;