Merge EDSP 0.5 w/ multi-arch support for external solvers

[apt.git] / apt-pkg / vendorlist.h

diff --git a/apt-pkg/vendorlist.h b/apt-pkg/vendorlist.h
index 4e050477f039e9a1ae2c30d407d36a8b32609cca..bc3702a93852e8952e625420e3810dbb4a8118c5 100644 (file)
--- a/apt-pkg/vendorlist.h
+++ b/apt-pkg/vendorlist.h
@@ -18,6 +18,8 @@
 #include <apt-pkg/macros.h>
 
 #ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/vendor.h>
+#include <apt-pkg/configuration.h>
 using std::string;
 using std::vector;
 #endif
@@ -25,7 +27,7 @@ using std::vector;
 class Vendor;
 class Configuration;
 
-class __deprecated pkgVendorList
+class APT_DEPRECATED pkgVendorList
 {
    protected:
    std::vector<Vendor const *> VendorList;