summaryrefslogtreecommitdiff
path: root/apt-pkg/packagemanager.h
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2014-11-07 14:20:36 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2014-11-08 14:26:00 +0100
commitccf6bdb3efc54165c76b42aae94c498a36acbe1b (patch)
tree9af1fdb0f6b30287ef79a54b2a38bca468bdfcc0 /apt-pkg/packagemanager.h
parent586d8704716a10e0f8b9c400cab500f5353eebe6 (diff)
use a abi version check similar to the gcc check
Git-Dch: Ignore
Diffstat (limited to 'apt-pkg/packagemanager.h')
-rw-r--r--apt-pkg/packagemanager.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 5bcd2045d..fce0ad301 100644
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -96,12 +96,10 @@ class pkgPackageManager : protected pkgCache::Namespace
virtual bool Install(PkgIterator /*Pkg*/,std::string /*File*/) {return false;};
virtual bool Configure(PkgIterator /*Pkg*/) {return false;};
virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+#if APT_PKG_ABI >= 413
virtual bool Go(APT::Progress::PackageManager * /*progress*/) {return true;};
- virtual bool Go(int /*statusFd*/=-1) {return true;};
-#else
- virtual bool Go(int /*statusFd*/=-1) {return true;};
#endif
+ virtual bool Go(int /*statusFd*/=-1) {return true;};
virtual void Reset() {};
@@ -114,8 +112,8 @@ class pkgPackageManager : protected pkgCache::Namespace
bool GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
pkgRecords *Recs);
- // Do the installation
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+ // Do the installation
+#if APT_PKG_ABI >= 413
OrderResult DoInstall(APT::Progress::PackageManager *progress);
// compat
APT_DEPRECATED OrderResult DoInstall(int statusFd=-1);
@@ -129,7 +127,7 @@ class pkgPackageManager : protected pkgCache::Namespace
Res = OrderInstall();
return Res;
};
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+#if APT_PKG_ABI >= 413
// stuff that needs to be done after the fork
OrderResult DoInstallPostFork(APT::Progress::PackageManager *progress);
// compat