guard ABI changes for LFS in apt-inst

[apt.git] / apt-inst / dirstream.h

diff --git a/apt-inst/dirstream.h b/apt-inst/dirstream.h
index 1be2688a11e637d1e06c203d66030c3a2d2450bd..53ac24ba5c8c5d02b8220c85edf24d6d57115269 100644 (file)
--- a/apt-inst/dirstream.h
+++ b/apt-inst/dirstream.h
@@ -25,6 +25,7 @@
 #ifndef PKGLIB_DIRSTREAM_H
 #define PKGLIB_DIRSTREAM_H
 
 #ifndef PKGLIB_DIRSTREAM_H
 #define PKGLIB_DIRSTREAM_H
 

+#include <apt-pkg/macros.h>

 
 class pkgDirStream
 { 
 
 class pkgDirStream
 { 


@@ -37,10 +38,15 @@ class pkgDirStream
                   Directory, FIFO} Type;
       char *Name;
       char *LinkTarget;
                   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;
       unsigned long Mode;
       unsigned long UID;
       unsigned long GID;

+#if APT_PKG_ABI < 413

       unsigned long Size;
       unsigned long Size;

+#endif

       unsigned long MTime;
       unsigned long Major;
       unsigned long Minor;
       unsigned long MTime;
       unsigned long Major;
       unsigned long Minor;


@@ -49,9 +55,13 @@ class pkgDirStream
    virtual bool DoItem(Item &Itm,int &Fd);
    virtual bool Fail(Item &Itm,int Fd);
    virtual bool FinishedFile(Item &Itm,int Fd);
    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;};
    virtual bool Process(Item &/*Itm*/,const unsigned char * /*Data*/,
                        unsigned long /*Size*/,unsigned long /*Pos*/) {return true;};

-      
+#endif

    virtual ~pkgDirStream() {};   
 };
 
    virtual ~pkgDirStream() {};   
 };