Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-pkg / deb / deblistparser.h

diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index 56a83b36e41cc3232a9015bf1ea25ed1ae7db1a1..f5ac47e1ec1d5dedb3b521ee6a449f3f5c743308 100644 (file)
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -44,12 +44,12 @@ class debListParser : public pkgCacheGenerator::ListParser
    protected:
    pkgTagFile Tags;
    pkgTagSection Section;
    protected:
    pkgTagFile Tags;
    pkgTagSection Section;

-   unsigned long iOffset;
+   map_filesize_t iOffset;

    std::string Arch;
    std::vector<std::string> Architectures;
    bool MultiArchEnabled;
 
    std::string Arch;
    std::vector<std::string> Architectures;
    bool MultiArchEnabled;
 

-   unsigned long UniqFindTagWrite(const char *Tag);
+   map_stringitem_t UniqFindTagWrite(const char *Tag);

    virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);
    bool ParseDepends(pkgCache::VerIterator &Ver,const char *Tag,
                     unsigned int Type);
    virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);
    bool ParseDepends(pkgCache::VerIterator &Ver,const char *Tag,
                     unsigned int Type);


@@ -77,8 +77,8 @@ class debListParser : public pkgCacheGenerator::ListParser
 #endif
    virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
                           pkgCache::VerIterator &Ver);
 #endif
    virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
                           pkgCache::VerIterator &Ver);

-   virtual unsigned long Offset() {return iOffset;};
-   virtual unsigned long Size() {return Section.size();};
+   virtual map_filesize_t Offset() {return iOffset;};
+   virtual map_filesize_t Size() {return Section.size();};

 
    virtual bool Step();
    
 
    virtual bool Step();