diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2014-04-30 21:54:52 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2014-04-30 21:54:52 +0200 |
| commit | 09b911adf4e22bbcac8c588bc14ade801276732e (patch) | |
| tree | 0d9eb9708479bb491d7e1e2bb030aa3e90299526 /src/process.c | |
| parent | b0e36b7048c88aa24f6955c53fbe790bb9ebc54f (diff) | |
| parent | 426b5dafdd837328d624a8ec5bfd567f2865c9f5 (diff) | |
Merge from emacs-24; up to 2014-05-01T10:21:17Z!rgm@gnu.org
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/process.c b/src/process.c index fdb0501f9ec..655f083fc33 100644 --- a/src/process.c +++ b/src/process.c @@ -6226,7 +6226,11 @@ handle_child_signal (int sig) int status; if (p->alive - && child_status_changed (p->pid, &status, WUNTRACED | WCONTINUED)) +#ifndef WCONTINUED + && child_status_changed (p->pid, &status, WUNTRACED)) +#else + && child_status_changed (p->pid, &status, WUNTRACED | WCONTINUED)) +#endif { /* Change the status of the process that was found. */ p->tick = ++process_tick; |