Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-inst / deb / debfile.h

diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h
index 880bcf6c59bb4b4a564d83cc95d6017ef6fcb883..b068efceccb45a050a5df7669133ac353509e906 100644 (file)
--- a/apt-inst/deb/debfile.h
+++ b/apt-inst/deb/debfile.h
@@ -81,12 +81,12 @@ class debDebFile::MemControlExtract : public pkgDirStream
    // Members from DirStream
    virtual bool DoItem(Item &Itm,int &Fd);
    virtual bool Process(Item &Itm,const unsigned char *Data,
    // Members from DirStream
    virtual bool DoItem(Item &Itm,int &Fd);
    virtual bool Process(Item &Itm,const unsigned char *Data,

-                       unsigned long Size,unsigned long Pos);
+                       unsigned long long Size,unsigned long long Pos);

    
 
    // Helpers
    bool Read(debDebFile &Deb);
    
 
    // Helpers
    bool Read(debDebFile &Deb);

-   bool TakeControl(const void *Data,unsigned long Size);
+   bool TakeControl(const void *Data,unsigned long long Size);

       
    MemControlExtract() : IsControl(false), Control(0), Length(0), Member("control") {};
    MemControlExtract(std::string Member) : IsControl(false), Control(0), Length(0), Member(Member) {};
       
    MemControlExtract() : IsControl(false), Control(0), Length(0), Member("control") {};
    MemControlExtract(std::string Member) : IsControl(false), Control(0), Length(0), Member(Member) {};