Merge branch 'debian/sid' into debian/experimental

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

diff --git a/apt-inst/dirstream.h b/apt-inst/dirstream.h
index dfb480bd42b699fbac12b456e1c13d9f915cb5ae..571fe86a57b3f80c3dbd75434aecf284dbe7a777 100644 (file)
--- a/apt-inst/dirstream.h
+++ b/apt-inst/dirstream.h
@@ -25,9 +25,6 @@
 #ifndef PKGLIB_DIRSTREAM_H
 #define PKGLIB_DIRSTREAM_H
 
 #ifndef PKGLIB_DIRSTREAM_H
 #define PKGLIB_DIRSTREAM_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/dirstream.h"
-#endif

 
 class pkgDirStream
 { 
 
 class pkgDirStream
 { 


@@ -40,10 +37,10 @@ class pkgDirStream
                   Directory, FIFO} Type;
       char *Name;
       char *LinkTarget;
                   Directory, FIFO} Type;
       char *Name;
       char *LinkTarget;

+      unsigned long long Size;

       unsigned long Mode;
       unsigned long UID;
       unsigned long GID;
       unsigned long Mode;
       unsigned long UID;
       unsigned long GID;

-      unsigned long Size;

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


@@ -52,8 +49,8 @@ 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);

-   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 long /*Size*/,unsigned long long /*Pos*/) {return true;};

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