diff options
| author | Michael Vogt <mvo@debian.org> | 2013-10-31 17:08:20 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-10-31 17:08:20 +0100 |
| commit | c5f0d8e6f8d338727b2b6bc4be0e482082398014 (patch) | |
| tree | 96cad2dfc47cca81b7a4d0ac3787c27003f2ca5d | |
| parent | bd5f39b34cc0e8cebbe9103f569d4d903e75bd2b (diff) | |
fix some more ABI issues, abicheck is happy now
| -rwxr-xr-x | abicheck/run_abi_test | 2 | ||||
| -rw-r--r-- | apt-pkg/deb/dpkgpm.h | 9 | ||||
| -rw-r--r-- | apt-pkg/packagemanager.h | 2 |
3 files changed, 11 insertions, 2 deletions
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() {}; |