Преглед изворни кода

fix some more ABI issues, abicheck is happy now

Michael Vogt пре 12 година
родитељ
комит
c5f0d8e6f8
3 измењених фајлова са 11 додато и 2 уклоњено
  1. 1 1
      abicheck/run_abi_test
  2. 9 0
      apt-pkg/deb/dpkgpm.h
  3. 1 1
      apt-pkg/packagemanager.h

+ 1 - 1
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 $@

+ 9 - 0
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);

+ 1 - 1
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() {};