From c5f0d8e6f8d338727b2b6bc4be0e482082398014 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Thu, 31 Oct 2013 17:08:20 +0100
Subject: fix some more ABI issues, abicheck is happy now

---
 apt-pkg/deb/dpkgpm.h     | 9 +++++++++
 apt-pkg/packagemanager.h | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'apt-pkg')

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() {};
-- 
cgit v1.2.3