From: Michael Vogt <mvo@debian.org>
Date: Thu, 31 Oct 2013 16:08:20 +0000 (+0100)
Subject: fix some more ABI issues, abicheck is happy now
X-Git-Tag: 0.9.13.exp1~6
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/c5f0d8e6f8d338727b2b6bc4be0e482082398014?ds=inline

fix some more ABI issues, abicheck is happy now
---

diff --git a/abicheck/run_abi_test b/abicheck/run_abi_test
index 9ee840ea0..8f2d7d203 100755
--- a/abicheck/run_abi_test
+++ b/abicheck/run_abi_test
@@ -16,4 +16,4 @@ sed s#@installed_libapt@#$LIBPATH# apt_installed.xml.in > apt_installed.xml
 BUILDPATH=$(readlink -f ../build)
 sed s#@build_path@#$BUILDPATH# apt_build.xml.in > apt_build.xml
 
-abi-compliance-checker -l apt -d1 apt_installed.xml -d2 apt_build.xml
+abi-compliance-checker -l apt -d1 apt_installed.xml -d2 apt_build.xml $@
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 4494bbae3..50b5d609b 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -107,6 +107,15 @@ class pkgDPkgPM : public pkgPackageManager
    void DoTerminalPty(int master);
    void DoDpkgStatusFd(int statusfd);
    void ProcessDpkgStatusLine(char *line);
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13)
+   void DoDpkgStatusFd(int statusfd, int unused) {
+      DoDpkgStatusFd(statusfd);
+   }
+   void ProcessDpkgStatusLine(int unused, char *line) {
+      ProcessDpkgStatusLine(line);
+   }
+#endif
+
 
    // The Actuall installation implementation
    virtual bool Install(PkgIterator Pkg,std::string File);
diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index a5c58e4a7..853b9bac8 100644
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -91,7 +91,7 @@ class pkgPackageManager : protected pkgCache::Namespace
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
    virtual bool Go(APT::Progress::PackageManager *progress) {return true;};
 #else
-   virtual bool Go(int StatusFd=-1) {return true;};
+   virtual bool Go(int statusFd=-1) {return true;};
 #endif
 
    virtual void Reset() {};