From a4f6bdc8bd91c7282ae9ac60c44844c6f0058a65 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Tue, 13 Dec 2011 00:54:37 +0100
Subject: revert 2184.1.2: do not pollute namespace in 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
---
 apt-inst/contrib/extracttar.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'apt-inst')

diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h
index 8754e8dcc..e104417c1 100644
--- a/apt-inst/contrib/extracttar.h
+++ b/apt-inst/contrib/extracttar.h
@@ -18,6 +18,10 @@
 
 #include <string>
 
+#ifndef APT_8_CLEANER_HEADERS
+using std::min;
+#endif
+
 class pkgDirStream;
 
 class ExtractTar
-- 
cgit v1.2.3


From b9dadc24b9477b466bc8058c765d76c65ecc7125 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Tue, 13 Dec 2011 01:22:38 +0100
Subject: 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
---
 apt-inst/contrib/arfile.h     | 3 +++
 apt-inst/contrib/extracttar.h | 2 ++
 apt-inst/database.h           | 4 ++++
 apt-inst/deb/debfile.h        | 4 ++++
 4 files changed, 13 insertions(+)

(limited to 'apt-inst')

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;
 
-- 
cgit v1.2.3