From 4dc77823d360158d6870a5710cc8c17064f1308f Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Wed, 15 Jul 2015 13:21:21 +0200
Subject: remove the compatibility markers for 4.13 abi

We aren't and we will not be really compatible again with the previous
stable abi, so lets drop these markers (which never made it into a
released version) for good as they have outlived their intend already.

Git-Dch: Ignore
---
 apt-inst/contrib/arfile.h      |  4 ----
 apt-inst/contrib/extracttar.cc |  5 -----
 apt-inst/contrib/extracttar.h  |  8 --------
 apt-inst/deb/debfile.cc        |  8 --------
 apt-inst/deb/debfile.h         |  8 --------
 apt-inst/dirstream.h           | 12 +-----------
 6 files changed, 1 insertion(+), 44 deletions(-)

(limited to 'apt-inst')

diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h
index f53356847..297303a9d 100644
--- a/apt-inst/contrib/arfile.h
+++ b/apt-inst/contrib/arfile.h
@@ -62,11 +62,7 @@ struct ARArchive::Member
    unsigned long long Size;
    
    // Location of the data.
-#if APT_PKG_ABI >= 413
    unsigned long long Start;
-#else
-   unsigned long Start;
-#endif
    Member *Next;
    
    Member() : Start(0), Next(0) {};
diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index be0b69d96..2c86d0d01 100644
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -60,13 +60,8 @@ struct ExtractTar::TarHeader
 // ExtractTar::ExtractTar - Constructor					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-#if APT_PKG_ABI >= 413
 ExtractTar::ExtractTar(FileFd &Fd,unsigned long long Max,string DecompressionProgram)
 	: File(Fd), MaxInSize(Max), DecompressProg(DecompressionProgram)
-#else
-ExtractTar::ExtractTar(FileFd &Fd,unsigned long Max,string DecompressionProgram)
-	: File(Fd), MaxInSize(Max), DecompressProg(DecompressionProgram)
-#endif
 {
    GZPid = -1;
    Eof = false;
diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h
index 57be956bd..22bb69e66 100644
--- a/apt-inst/contrib/extracttar.h
+++ b/apt-inst/contrib/extracttar.h
@@ -40,11 +40,7 @@ class ExtractTar
                   GNU_LongLink = 'K',GNU_LongName = 'L'};
 
    FileFd &File;
-#if APT_PKG_ABI >= 413
    unsigned long long MaxInSize;
-#else
-   unsigned long MaxInSize;
-#endif
    int GZPid;
    FileFd InFd;
    bool Eof;
@@ -58,11 +54,7 @@ class ExtractTar
 
    bool Go(pkgDirStream &Stream);
 
-#if APT_PKG_ABI >= 413
    ExtractTar(FileFd &Fd,unsigned long long Max,std::string DecompressionProgram);
-#else
-   ExtractTar(FileFd &Fd,unsigned long Max,std::string DecompressionProgram);
-#endif
    virtual ~ExtractTar();
 };
 
diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc
index a8bf754e4..4853a13c7 100644
--- a/apt-inst/deb/debfile.cc
+++ b/apt-inst/deb/debfile.cc
@@ -203,11 +203,7 @@ bool debDebFile::MemControlExtract::DoItem(Item &Itm,int &Fd)
 /* Just memcopy the block from the tar extractor and put it in the right
    place in the pre-allocated memory block. */
 bool debDebFile::MemControlExtract::Process(Item &/*Itm*/,const unsigned char *Data,
-#if APT_PKG_ABI >= 413
 			     unsigned long long Size,unsigned long long Pos)
-#else
-			     unsigned long Size,unsigned long Pos)
-#endif
 {
    memcpy(Control + Pos, Data,Size);
    return true;
@@ -236,11 +232,7 @@ bool debDebFile::MemControlExtract::Read(debDebFile &Deb)
 // ---------------------------------------------------------------------
 /* The given memory block is loaded into the parser and parsed as a control
    record. */
-#if APT_PKG_ABI >= 413
 bool debDebFile::MemControlExtract::TakeControl(const void *Data,unsigned long long Size)
-#else
-bool debDebFile::MemControlExtract::TakeControl(const void *Data,unsigned long Size)
-#endif
 {
    delete [] Control;
    Control = new char[Size+2];
diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h
index 6ad9b7659..02ebaae2e 100644
--- a/apt-inst/deb/debfile.h
+++ b/apt-inst/deb/debfile.h
@@ -82,19 +82,11 @@ class debDebFile::MemControlExtract : public pkgDirStream
    // Members from DirStream
    virtual bool DoItem(Item &Itm,int &Fd) APT_OVERRIDE;
    virtual bool Process(Item &Itm,const unsigned char *Data,
-#if APT_PKG_ABI >= 413
 			unsigned long long Size,unsigned long long Pos) APT_OVERRIDE;
-#else
-			unsigned long Size,unsigned long Pos);
-#endif
 
    // Helpers
    bool Read(debDebFile &Deb);
-#if APT_PKG_ABI >= 413
    bool TakeControl(const void *Data,unsigned long long Size);
-#else
-   bool TakeControl(const void *Data,unsigned long Size);
-#endif
 
    MemControlExtract() : IsControl(false), Control(0), Length(0), Member("control") {};
    MemControlExtract(std::string Member) : IsControl(false), Control(0), Length(0), Member(Member) {};
diff --git a/apt-inst/dirstream.h b/apt-inst/dirstream.h
index 53ac24ba5..dac965db7 100644
--- a/apt-inst/dirstream.h
+++ b/apt-inst/dirstream.h
@@ -38,15 +38,10 @@ class pkgDirStream
 	           Directory, FIFO} Type;
       char *Name;
       char *LinkTarget;
-#if APT_PKG_ABI >= 413
-      unsigned long long Size;
-#endif
       unsigned long Mode;
       unsigned long UID;
       unsigned long GID;
-#if APT_PKG_ABI < 413
-      unsigned long Size;
-#endif
+      unsigned long long Size;
       unsigned long MTime;
       unsigned long Major;
       unsigned long Minor;
@@ -55,13 +50,8 @@ class pkgDirStream
    virtual bool DoItem(Item &Itm,int &Fd);
    virtual bool Fail(Item &Itm,int Fd);
    virtual bool FinishedFile(Item &Itm,int Fd);
-#if APT_PKG_ABI >= 413
    virtual bool Process(Item &/*Itm*/,const unsigned char * /*Data*/,
 			unsigned long long /*Size*/,unsigned long long /*Pos*/) {return true;};
-#else
-   virtual bool Process(Item &/*Itm*/,const unsigned char * /*Data*/,
-			unsigned long /*Size*/,unsigned long /*Pos*/) {return true;};
-#endif
    virtual ~pkgDirStream() {};   
 };
 
-- 
cgit v1.2.3