Merge remote-tracking branch 'donkult/debian/sid' into debian/experimental

[apt.git] / apt-private / private-output.h

diff --git a/apt-private/private-output.h b/apt-private/private-output.h
index 81643f90a6b6f899990d5b44e22906902fc4a936..6f3a964d76124b09488d71873f9718d87b325d0a 100644 (file)
--- a/apt-private/private-output.h
+++ b/apt-private/private-output.h
@@ -2,6 +2,7 @@
 #define APT_PRIVATE_OUTPUT_H
 
 #include <apt-pkg/pkgcache.h>
 #define APT_PRIVATE_OUTPUT_H
 
 #include <apt-pkg/pkgcache.h>

+#include <apt-pkg/macros.h>

 
 #include <fstream>
 #include <string>
 
 #include <fstream>
 #include <string>


@@ -13,22 +14,25 @@ class pkgDepCache;
 class pkgRecords;
 
 
 class pkgRecords;
 
 

-extern std::ostream c0out;
-extern std::ostream c1out;
-extern std::ostream c2out;
-extern std::ofstream devnull;
-extern unsigned int ScreenWidth;
+APT_PUBLIC extern std::ostream c0out;
+APT_PUBLIC extern std::ostream c1out;
+APT_PUBLIC extern std::ostream c2out;
+APT_PUBLIC extern std::ofstream devnull;
+APT_PUBLIC extern unsigned int ScreenWidth;

 
 

-bool InitOutput();
-void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records, 
+APT_PUBLIC bool InitOutput();
+
+void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records,

                        pkgCache::VerIterator V, std::ostream &out,
                        bool include_summary=true);
 
 
 // helper to describe global state
                        pkgCache::VerIterator V, std::ostream &out,
                        bool include_summary=true);
 
 
 // helper to describe global state

-bool ShowList(std::ostream &out, std::string Title, std::string List,
+APT_PUBLIC void ShowBroken(std::ostream &out, CacheFile &Cache, bool const Now);
+APT_PUBLIC void ShowBroken(std::ostream &out, pkgCacheFile &Cache, bool const Now);
+
+APT_PUBLIC bool ShowList(std::ostream &out, std::string Title, std::string List,

               std::string VersionsList);
               std::string VersionsList);

-void ShowBroken(std::ostream &out,CacheFile &Cache,bool Now);

 void ShowNew(std::ostream &out,CacheFile &Cache);
 void ShowDel(std::ostream &out,CacheFile &Cache);
 void ShowKept(std::ostream &out,CacheFile &Cache);
 void ShowNew(std::ostream &out,CacheFile &Cache);
 void ShowDel(std::ostream &out,CacheFile &Cache);
 void ShowKept(std::ostream &out,CacheFile &Cache);