Fixed WaitFD

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

diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index f959f42333fc2d1a2192eb3298e755e7fd1f5b4b..ce9c866fb6cdc96ad26232422d4e21db3785f05c 100644 (file)
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: pkgcache.h,v 1.14 1998/12/14 03:39:15 jgg Exp $
+// $Id: pkgcache.h,v 1.16 1999/02/01 02:22:11 jgg Exp $

 /* ######################################################################
    
    Cache - Structure definitions for the cache file
 /* ######################################################################
    
    Cache - Structure definitions for the cache file


@@ -82,7 +82,7 @@ class pkgCache
    {
       enum PkgFlags {Auto=(1<<0),New=(1<<1),Obsolete=(1<<2),Essential=(1<<3),
         ImmediateConf=(1<<4)};
    {
       enum PkgFlags {Auto=(1<<0),New=(1<<1),Obsolete=(1<<2),Essential=(1<<3),
         ImmediateConf=(1<<4)};

-      enum PkgFFlags {NotSource=(1<<0)};
+      enum PkgFFlags {NotSource=(1<<0),NotAutomatic=(1<<1)};

    };
    
    protected:
    };
    
    protected:


@@ -207,13 +207,11 @@ struct pkgCache::PackageFile
    __apt_ptrloc Label;           // Stringtable
    __apt_ptrloc Architecture;    // Stringtable
    unsigned long Size;            
    __apt_ptrloc Label;           // Stringtable
    __apt_ptrloc Architecture;    // Stringtable
    unsigned long Size;            

-   unsigned char NotAutomatic;   // Bool
-
+   unsigned long Flags;

    
    // Linked list
    __apt_ptrloc NextFile;        // PackageFile
    unsigned short ID;
    
    // Linked list
    __apt_ptrloc NextFile;        // PackageFile
    unsigned short ID;

-   unsigned long Flags;

    time_t mtime;                  // Modification time for the file
 };
 
    time_t mtime;                  // Modification time for the file
 };
 


@@ -229,7 +227,8 @@ struct pkgCache::Version
 {
    __apt_ptrloc VerStr;            // Stringtable
    __apt_ptrloc Section;           // StringTable (StringItem)
 {
    __apt_ptrloc VerStr;            // Stringtable
    __apt_ptrloc Section;           // StringTable (StringItem)

-   
+   __apt_ptrloc Arch;              // StringTable
+      

    // Lists
    __apt_ptrloc FileList;          // VerFile
    __apt_ptrloc NextVer;           // Version
    // Lists
    __apt_ptrloc FileList;          // VerFile
    __apt_ptrloc NextVer;           // Version