diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-05-03 13:13:10 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-05-03 13:13:10 -0700 |
| commit | d355cad6b78c35050ba94016bb7ee12acbd257ee (patch) | |
| tree | aad901f9b23d2a4fd400529a84b0b891e9af0cb1 | |
| parent | 8494d3796ca3fc153f65f13869d823beaddf07a2 (diff) | |
| download | emacs-d355cad6b78c35050ba94016bb7ee12acbd257ee.tar.gz | |
Handle systems without WCONTINUED consistently.
* lib-src/emacsclient.c (WCONTINUED): Move to ../src/syswait.h.
* src/process.c (handle_child_signal): Remove WCONTINUED ifdef,
because WCONTINUED is always defined now.
* src/syswait.h (WCONTINUED): Move here from ../lib-src/emacsclient.c.
Fixes: debbugs:15110 debbugs:17339
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 4 | ||||
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/process.c | 6 | ||||
| -rw-r--r-- | src/syswait.h | 4 |
5 files changed, 17 insertions, 9 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 22722046436..2176549a351 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2014-05-03 Paul Eggert <eggert@cs.ucla.edu> + + Handle systems without WCONTINUED consistently. (Bug#15110, 17339) + * emacsclient.c (WCONTINUED): Move to ../src/syswait.h. + 2014-04-29 Glenn Morris <rgm@gnu.org> * Makefile.in ($(DESTDIR)${archlibdir}): diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index bd0aa121836..a1177f54576 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -65,10 +65,6 @@ char *w32_getenv (char *); # define CLOSE_SOCKET close # define INITIALIZE() -# ifndef WCONTINUED -# define WCONTINUED 8 -# endif - #define egetenv(VAR) getenv(VAR) #endif /* !WINDOWSNT */ diff --git a/src/ChangeLog b/src/ChangeLog index ca867c99599..15b7c202034 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2014-05-03 Paul Eggert <eggert@cs.ucla.edu> + + Handle systems without WCONTINUED consistently. (Bug#15110, 17339) + * process.c (handle_child_signal): Remove WCONTINUED ifdef, + because WCONTINUED is always defined now. + * syswait.h (WCONTINUED): Move here from ../lib-src/emacsclient.c. + 2014-05-03 Eli Zaretskii <eliz@gnu.org> * buffer.c (overlay_strings): Fix the wording of the commentary. diff --git a/src/process.c b/src/process.c index 07b690e6ebd..2c66b9e976e 100644 --- a/src/process.c +++ b/src/process.c @@ -6225,11 +6225,7 @@ handle_child_signal (int sig) int status; if (p->alive -#ifndef WCONTINUED - && child_status_changed (p->pid, &status, WUNTRACED)) -#else - && child_status_changed (p->pid, &status, WUNTRACED | WCONTINUED)) -#endif + && child_status_changed (p->pid, &status, WUNTRACED | WCONTINUED)) { /* Change the status of the process that was found. */ p->tick = ++process_tick; diff --git a/src/syswait.h b/src/syswait.h index db197b82fb7..9c8cbd51f00 100644 --- a/src/syswait.h +++ b/src/syswait.h @@ -29,6 +29,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <sys/wait.h> #endif /* !HAVE_SYS_WAIT_H */ +#ifndef WCONTINUED +#define WCONTINUED 8 +#endif + #ifndef WCOREDUMP /* not POSIX */ #define WCOREDUMP(status) ((status) & 0x80) #endif |