Merge remote-tracking branch 'mvo/feature/helpful-apt-list' into debian/sid

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

diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h
index 828ee37..f3092d3 100644 (file)
--- a/apt-pkg/edsp.h
+++ b/apt-pkg/edsp.h
@@ -9,8 +9,12 @@
 #ifndef PKGLIB_EDSP_H
 #define PKGLIB_EDSP_H
 
-#include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheset.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/macros.h>
+
+#include <stdio.h>
 
 #include <list>
 #include <string>
@@ -29,15 +33,15 @@ class EDSP                                                          /*{{{*/
        static const char * const PrioMap[];
        static const char * const DepMap[];
 
-       bool static ReadLine(int const input, std::string &line);
-       bool static StringToBool(char const *answer, bool const defValue);
+       APT_HIDDEN bool static ReadLine(int const input, std::string &line);
+       APT_HIDDEN bool static StringToBool(char const *answer, bool const defValue);
 
-       void static WriteScenarioVersion(pkgDepCache &Cache, FILE* output,
+       APT_HIDDEN void static WriteScenarioVersion(pkgDepCache &Cache, FILE* output,
                                         pkgCache::PkgIterator const &Pkg,
                                         pkgCache::VerIterator const &Ver);
-       void static WriteScenarioDependency(FILE* output,
+       APT_HIDDEN void static WriteScenarioDependency(FILE* output,
                                            pkgCache::VerIterator const &Ver);
-       void static WriteScenarioLimitedDependency(FILE* output,
+       APT_HIDDEN void static WriteScenarioLimitedDependency(FILE* output,
                                                   pkgCache::VerIterator const &Ver,
                                                   APT::PackageSet const &pkgset);
 public: