From 3826564e07eaffb05eca5af34a0e76f6f161b89c Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Mon, 13 Dec 2004 10:59:20 +0000 Subject: Merge misc-abi-changes Patches applied: * apt@packages.debian.org/apt--misc-abi-changes--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-16 * apt@packages.debian.org/apt--misc-abi-changes--0--patch-1 Fix apt-get -s remove to not display the candidate version * apt@packages.debian.org/apt--misc-abi-changes--0--patch-2 Merge from main * apt@packages.debian.org/apt--misc-abi-changes--0--patch-3 Use pid_t throughout to hold process IDs --- ftparchive/multicompress.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ftparchive/multicompress.h') diff --git a/ftparchive/multicompress.h b/ftparchive/multicompress.h index 212dec63d..444d8626f 100644 --- a/ftparchive/multicompress.h +++ b/ftparchive/multicompress.h @@ -55,7 +55,7 @@ class MultiCompress mode_t Permissions; static const CompType Compressors[]; - bool OpenCompress(const CompType *Prog,int &Pid,int FileFd, + bool OpenCompress(const CompType *Prog,pid_t &Pid,int FileFd, int &OutFd,bool Comp); bool Child(int Fd); bool Start(); @@ -68,8 +68,8 @@ class MultiCompress unsigned long UpdateMTime; bool Finalize(unsigned long &OutSize); - bool OpenOld(int &Fd,int &Proc); - bool CloseOld(int Fd,int Proc); + bool OpenOld(int &Fd,pid_t &Proc); + bool CloseOld(int Fd,pid_t Proc); static bool GetStat(string Output,string Compress,struct stat &St); MultiCompress(string Output,string Compress,mode_t Permissions, -- cgit v1.2.3