aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorJuanma Barranquero2014-04-30 21:54:52 +0200
committerJuanma Barranquero2014-04-30 21:54:52 +0200
commit09b911adf4e22bbcac8c588bc14ade801276732e (patch)
tree0d9eb9708479bb491d7e1e2bb030aa3e90299526 /src/process.c
parentb0e36b7048c88aa24f6955c53fbe790bb9ebc54f (diff)
parent426b5dafdd837328d624a8ec5bfd567f2865c9f5 (diff)
downloademacs-09b911adf4e22bbcac8c588bc14ade801276732e.tar.gz
emacs-09b911adf4e22bbcac8c588bc14ade801276732e.zip
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.c6
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)
6226 int status; 6226 int status;
6227 6227
6228 if (p->alive 6228 if (p->alive
6229 && child_status_changed (p->pid, &status, WUNTRACED | WCONTINUED)) 6229#ifndef WCONTINUED
6230 && child_status_changed (p->pid, &status, WUNTRACED))
6231#else
6232 && child_status_changed (p->pid, &status, WUNTRACED | WCONTINUED))
6233#endif
6230 { 6234 {
6231 /* Change the status of the process that was found. */ 6235 /* Change the status of the process that was found. */
6232 p->tick = ++process_tick; 6236 p->tick = ++process_tick;