merged r1970 lp:~vorlon/apt/lp.968828

[apt.git] / apt-inst / contrib / extracttar.h

diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h
index 27c453d0d5e003a6795345c7e1c580ee14317f93..4b29df3141ae71dfbd54c08fae1b5f381f17a899 100644 (file)
--- a/apt-inst/contrib/extracttar.h
+++ b/apt-inst/contrib/extracttar.h
@@ -15,9 +15,16 @@
 #define PKGLIB_EXTRACTTAR_H
 
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/dirstream.h>
 
+#include <string>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/dirstream.h>
 #include <algorithm>
+using std::min;
+#endif
+
+class pkgDirStream;
 
 class ExtractTar
 {