diff options
| author | Matt Zimmerman <matt.zimmerman@canonical.com> | 2004-12-13 10:59:20 +0000 |
|---|---|---|
| committer | Matt Zimmerman <matt.zimmerman@canonical.com> | 2004-12-13 10:59:20 +0000 |
| commit | 3826564e07eaffb05eca5af34a0e76f6f161b89c (patch) | |
| tree | ef95b63a23cac888d1a7a821bdeccdd809df9272 /ftparchive/writer.cc | |
| parent | 7db98ffceda347f0bc457c6bdc4ff33d60e26b18 (diff) | |
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
Diffstat (limited to 'ftparchive/writer.cc')
| -rw-r--r-- | ftparchive/writer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index e1fd33ad3..35a23a3d7 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -754,7 +754,7 @@ bool ContentsWriter::ReadFromPkgs(string PkgFile,string PkgCompress) // Open the package file int CompFd = -1; - int Proc = -1; + pid_t Proc = -1; if (Pkgs.OpenOld(CompFd,Proc) == false) return false; |