Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-pkg / contrib / mmap.h

diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h
index 387e9a170bab9d5c0253dd8a0779f641f91dc3b0..6bd4a2d863ca3c118252021c74e0715c5099b068 100644 (file)
--- a/apt-pkg/contrib/mmap.h
+++ b/apt-pkg/contrib/mmap.h
@@ -27,7 +27,13 @@
 
 
 #include <string>
 
 
 #include <string>

+
+#ifndef APT_8_CLEANER_HEADERS

 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/fileutl.h>

+using std::string;
+#endif
+
+class FileFd;

 
 /* This should be a 32 bit type, larger tyes use too much ram and smaller
    types are too small. Where ever possible 'unsigned long' should be used
 
 /* This should be a 32 bit type, larger tyes use too much ram and smaller
    types are too small. Where ever possible 'unsigned long' should be used