Merge with Michael and resolve conflicts

[apt.git] / apt-pkg / tagfile.h

diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 8c948754dbb62acdf22232dd1db6103d3ea2f635..dd481ba510ea9fe1838ffe278ac1cc962493f293 100644 (file)
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -25,6 +25,7 @@
 #endif 
 
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/mmap.h>
 #include <stdio.h>
     
 class pkgTagSection
@@ -69,6 +70,7 @@ class pkgTagSection
 class pkgTagFile
 {
    FileFd &Fd;
+   MMap *Map;
    char *Buffer;
    char *Start;
    char *End;
@@ -84,7 +86,7 @@ class pkgTagFile
    inline unsigned long Offset() {return iOffset;};
    bool Jump(pkgTagSection &Tag,unsigned long Offset);
 
-   pkgTagFile(FileFd *F,unsigned long Size = 32*1024);
+   pkgTagFile(FileFd *F,unsigned long Size = 64*1024);
    ~pkgTagFile();
 };