Merge branch 'debian/sid' into debian/experimental

[apt.git] / cmdline / apt-extracttemplates.h

diff --git a/cmdline/apt-extracttemplates.h b/cmdline/apt-extracttemplates.h
index 6d07a09c20e50d684e4d04dc923e930607b4a3d7..829cdae755c39b5ca8eb5c1d6542c6f3589310e0 100644 (file)
--- a/cmdline/apt-extracttemplates.h
+++ b/cmdline/apt-extracttemplates.h
@@ -11,15 +11,15 @@
 #define _APTEXTRACTTEMPLATE_H_
 
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/pkgcache.h>
 #include <apt-pkg/dirstream.h>
 
 #include <string>
 
+class pkgCache;
+
 class DebFile : public pkgDirStream
 {
        FileFd File;
-       unsigned long Size;
        char *Control;
        unsigned long ControlLen;
        
@@ -28,7 +28,7 @@ public:
        ~DebFile();
        bool DoItem(Item &I, int &fd);
        bool Process(pkgDirStream::Item &I, const unsigned char *data, 
-               unsigned long size, unsigned long pos);
+               unsigned long long size, unsigned long long pos);
 
        bool Go();
        bool ParseInfo();