do not make PTY slave the controlling terminal

[ntk/apt.git] / apt-pkg / metaindex.h

diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h
index 1471542..ffabaad 100644 (file)
--- a/apt-pkg/metaindex.h
+++ b/apt-pkg/metaindex.h
@@ -1,12 +1,19 @@
 #ifndef PKGLIB_METAINDEX_H
 #define PKGLIB_METAINDEX_H
 
-
-#include <string>
-#include <apt-pkg/pkgcache.h>
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/init.h>
 
+#include <stddef.h>
+
+#include <string>
+#include <vector>
+
+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/pkgcache.h>
+class pkgCacheGenerator;
+class OpProgress;
+#endif
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/pkgrecords.h>
@@ -15,8 +22,6 @@ using std::string;
 #endif
 
 class pkgAcquire;
-class pkgCacheGenerator;
-class OpProgress;
 
 class metaIndex
 {
@@ -36,10 +41,6 @@ class metaIndex
 
    // interface to to query it
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
-   virtual std::string MetaIndexInfo(const char *Type) const {return "";};
-   virtual std::string MetaIndexFile(const char *Types) const {return "";};
-   virtual std::string MetaIndexURI(const char *Type) const {return "";};
-
    // returns the path of the local file (or "" if its not available)
    virtual std::string LocalFileName() const {return "";};
 #endif