=== modified file 'lib-src/ChangeLog'
--- lib-src/ChangeLog	2014-04-29 14:54:58 +0000
+++ lib-src/ChangeLog	2014-05-03 20:11:49 +0000
@@ -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}):

=== modified file 'lib-src/emacsclient.c'
--- lib-src/emacsclient.c	2014-03-10 00:09:30 +0000
+++ lib-src/emacsclient.c	2014-05-03 20:11:49 +0000
@@ -65,10 +65,6 @@
 # define CLOSE_SOCKET close
 # define INITIALIZE()
 
-# ifndef WCONTINUED
-#  define WCONTINUED 8
-# endif
-
 #define egetenv(VAR) getenv(VAR)
 
 #endif /* !WINDOWSNT */

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2014-05-03 08:47:50 +0000
+++ src/ChangeLog	2014-05-03 20:11:49 +0000
@@ -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.

=== modified file 'src/process.c'
--- src/process.c	2014-04-29 15:12:36 +0000
+++ src/process.c	2014-05-03 20:11:49 +0000
@@ -6225,11 +6225,7 @@
       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;

=== modified file 'src/syswait.h'
--- src/syswait.h	2014-01-16 06:24:06 +0000
+++ src/syswait.h	2014-05-03 20:11:49 +0000
@@ -29,6 +29,10 @@
 #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