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

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 227220464367aa0a6021b004f174634cc340d6d6..2176549a351e21322d0d5fa6eabf7cf8ed6bd79b 100644 (file)
--- 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 bd0aa121836902cf44bbf0b02c6fe8157cb2fb71..a1177f54576df8086f5143a25c5a718b099c1ab3 100644 (file)
--- 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 ca867c99599777ea4c44b0d14910bb12b9fe84ed..15b7c202034941a7a4f1e2c30de47c96c1669e35 100644 (file)
--- 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 07b690e6ebde1a6127e9f5ba732ed1e63f919a6f..2c66b9e976e3c745c11bf0ff0281df174a043c53 100644 (file)
--- 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 db197b82fb77a35bea4d6fb55c98b4c7b4ee5ca8..9c8cbd51f0043f794ea625fdfd2c92f9aa7f82c3 100644 (file)
--- 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