Commit d355cad6 authored by Paul Eggert's avatar Paul Eggert
Browse files

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
parent 8494d379
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> 2014-04-29 Glenn Morris <rgm@gnu.org>
* Makefile.in ($(DESTDIR)${archlibdir}): * Makefile.in ($(DESTDIR)${archlibdir}):
......
...@@ -65,10 +65,6 @@ char *w32_getenv (char *); ...@@ -65,10 +65,6 @@ char *w32_getenv (char *);
# define CLOSE_SOCKET close # define CLOSE_SOCKET close
# define INITIALIZE() # define INITIALIZE()
# ifndef WCONTINUED
# define WCONTINUED 8
# endif
#define egetenv(VAR) getenv(VAR) #define egetenv(VAR) getenv(VAR)
#endif /* !WINDOWSNT */ #endif /* !WINDOWSNT */
......
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> 2014-05-03 Eli Zaretskii <eliz@gnu.org>
* buffer.c (overlay_strings): Fix the wording of the commentary. * buffer.c (overlay_strings): Fix the wording of the commentary.
......
...@@ -6225,11 +6225,7 @@ handle_child_signal (int sig) ...@@ -6225,11 +6225,7 @@ handle_child_signal (int sig)
int status; int status;
if (p->alive if (p->alive
#ifndef WCONTINUED
&& child_status_changed (p->pid, &status, WUNTRACED))
#else
&& child_status_changed (p->pid, &status, WUNTRACED | WCONTINUED)) && child_status_changed (p->pid, &status, WUNTRACED | WCONTINUED))
#endif
{ {
/* Change the status of the process that was found. */ /* Change the status of the process that was found. */
p->tick = ++process_tick; p->tick = ++process_tick;
......
...@@ -29,6 +29,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -29,6 +29,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <sys/wait.h> #include <sys/wait.h>
#endif /* !HAVE_SYS_WAIT_H */ #endif /* !HAVE_SYS_WAIT_H */
#ifndef WCONTINUED
#define WCONTINUED 8
#endif
#ifndef WCOREDUMP /* not POSIX */ #ifndef WCOREDUMP /* not POSIX */
#define WCOREDUMP(status) ((status) & 0x80) #define WCOREDUMP(status) ((status) & 0x80)
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment