diff options
| author | Paul Eggert | 2014-05-04 12:37:56 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-05-04 12:37:56 -0700 |
| commit | 3e9fa60a5c99568817a12a1011b0e61cce5d3a67 (patch) | |
| tree | 831a801351db662f324d0709bf1fee718eda63e9 /src/process.c | |
| parent | bbdcf64f499636ba9567e8fed8f209e06380352c (diff) | |
| parent | 61febcb6e32860575316b8a539a2e9f13f70e3c2 (diff) | |
| download | emacs-3e9fa60a5c99568817a12a1011b0e61cce5d3a67.tar.gz emacs-3e9fa60a5c99568817a12a1011b0e61cce5d3a67.zip | |
Merge from emacs-24; up to 2014-05-04T21:18:30Z!eggert@cs.ucla.edu
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/process.c b/src/process.c index 655f083fc33..fdb0501f9ec 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -6226,11 +6226,7 @@ handle_child_signal (int sig) | |||
| 6226 | int status; | 6226 | int status; |
| 6227 | 6227 | ||
| 6228 | if (p->alive | 6228 | if (p->alive |
| 6229 | #ifndef WCONTINUED | 6229 | && child_status_changed (p->pid, &status, WUNTRACED | WCONTINUED)) |
| 6230 | && child_status_changed (p->pid, &status, WUNTRACED)) | ||
| 6231 | #else | ||
| 6232 | && child_status_changed (p->pid, &status, WUNTRACED | WCONTINUED)) | ||
| 6233 | #endif | ||
| 6234 | { | 6230 | { |
| 6235 | /* Change the status of the process that was found. */ | 6231 | /* Change the status of the process that was found. */ |
| 6236 | p->tick = ++process_tick; | 6232 | p->tick = ++process_tick; |