1 files changed, 7 insertions, 8 deletions
diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 5cff2681c..6536932dd 100644
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -20,12 +20,8 @@
 #ifndef PKGLIB_TAGFILE_H
 #define PKGLIB_TAGFILE_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/tagfile.h"
-#endif 
 
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/mmap.h>
 #include <stdio.h>
     
 class pkgTagSection
@@ -34,8 +30,8 @@ class pkgTagSection
    const char *Stop;
    
    // We have a limit of 256 tags per section.
-   unsigned short Indexes[256];
-   unsigned short AlphaIndexes[0x100];
+   unsigned int Indexes[256];
+   unsigned int AlphaIndexes[0x100];
    
    unsigned int TagCount;
      
@@ -70,13 +66,16 @@ class pkgTagSection
 class pkgTagFile
 {
    FileFd &Fd;
-   MMap *Map;
    char *Buffer;
    char *Start;
    char *End;
+   bool Done;
    unsigned long iOffset;
    unsigned long Size;
-   
+
+   bool Fill();
+   bool Resize();
+
    public:
 
    bool Step(pkgTagSection &Section);