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 /methods | |
| 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 'methods')
| -rw-r--r-- | methods/gzip.cc | 2 | ||||
| -rw-r--r-- | methods/rsh.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/methods/gzip.cc b/methods/gzip.cc index 75a038979..809afc0fc 100644 --- a/methods/gzip.cc +++ b/methods/gzip.cc @@ -57,7 +57,7 @@ bool GzipMethod::Fetch(FetchItem *Itm) return _error->Errno("pipe",_("Couldn't open pipe for %s"),Prog); // Fork gzip - int Process = ExecFork(); + pid_t Process = ExecFork(); if (Process == 0) { close(GzOut[0]); diff --git a/methods/rsh.h b/methods/rsh.h index bb97f062c..b06d5a94e 100644 --- a/methods/rsh.h +++ b/methods/rsh.h @@ -29,7 +29,7 @@ class RSHConn public: - int Process; + pid_t Process; // Raw connection IO bool WriteMsg(string &Text,bool Sync,const char *Fmt,...); |