[ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines

[apt.git] / apt-pkg / edsp / edspindexfile.h

diff --git a/apt-pkg/edsp/edspindexfile.h b/apt-pkg/edsp/edspindexfile.h
index 0053388eb8d790a227d0cc80108fdf992dd6f2ea..de10f2d2f7a4ba20a25527b65359c2fc9f0c06db 100644 (file)
--- a/apt-pkg/edsp/edspindexfile.h
+++ b/apt-pkg/edsp/edspindexfile.h
@@ -8,9 +8,12 @@
 #ifndef PKGLIB_EDSPINDEXFILE_H
 #define PKGLIB_EDSPINDEXFILE_H
 
 #ifndef PKGLIB_EDSPINDEXFILE_H
 #define PKGLIB_EDSPINDEXFILE_H
 

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

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

+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/indexfile.h>
+#endif
+

 class edspIndex : public debStatusIndex
 {
    /** \brief dpointer placeholder (for later in case we need it) */
 class edspIndex : public debStatusIndex
 {
    /** \brief dpointer placeholder (for later in case we need it) */


@@ -22,7 +25,7 @@ class edspIndex : public debStatusIndex
 
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
 
 
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
 

-   edspIndex(string File);
+   edspIndex(std::string File);

 };
 
 #endif
 };
 
 #endif