Merge from emacs-24; up to 2014-05-04T21:18:30Z!eggert@cs.ucla.edu

2 files changed, 5 insertions, 4 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 94ba8f4a9c2..b16f881c4de 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Handle systems without WCONTINUED consistently.  (Bug#15110, 17339)
+        * emacsclient.c (WCONTINUED): Move to ../src/syswait.h.
+
 2014-04-30  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 */