tests: add epoch-packages to try clean with epochs

[apt.git] / ftparchive / multicompress.h

diff --git a/ftparchive/multicompress.h b/ftparchive/multicompress.h
index ac8bd0746e66185a82f5e7f0f358242343c6ee69..161716b866de76c1476ea443c8eacf0a6bdda2c4 100644 (file)
--- a/ftparchive/multicompress.h
+++ b/ftparchive/multicompress.h
@@ -22,7 +22,8 @@
 #include <string>
 #include <stdio.h>
 #include <sys/types.h>
 #include <string>
 #include <stdio.h>
 #include <sys/types.h>

-    
+#include <time.h>
+

 class MultiCompress
 {
    // An output file
 class MultiCompress
 {
    // An output file


@@ -34,7 +35,6 @@ class MultiCompress
       FileFd TmpFile;
       pid_t CompressProc;
       time_t OldMTime;
       FileFd TmpFile;
       pid_t CompressProc;
       time_t OldMTime;

-      int Fd;

    };
    
    Files *Outputs;
    };
    
    Files *Outputs;


@@ -48,12 +48,11 @@ class MultiCompress
    public:
    
    // The FD to write to for compression.
    public:
    
    // The FD to write to for compression.

-   FILE *Input;
+   FileFd Input;

    unsigned long UpdateMTime;
    
    bool Finalize(unsigned long long &OutSize);
    unsigned long UpdateMTime;
    
    bool Finalize(unsigned long long &OutSize);

-   bool OpenOld(int &Fd,pid_t &Proc);
-   bool CloseOld(int Fd,pid_t Proc);
+   bool OpenOld(FileFd &Fd);

    static bool GetStat(std::string const &Output,std::string const &Compress,struct stat &St);
    
    MultiCompress(std::string const &Output,std::string const &Compress,
    static bool GetStat(std::string const &Output,std::string const &Compress,struct stat &St);
    
    MultiCompress(std::string const &Output,std::string const &Compress,