diff options
| author | Paul Eggert <[email protected]> | 2014-05-04 12:37:56 -0700 |
|---|---|---|
| committer | Paul Eggert <[email protected]> | 2014-05-04 12:37:56 -0700 |
| commit | 3e9fa60a5c99568817a12a1011b0e61cce5d3a67 (patch) | |
| tree | 831a801351db662f324d0709bf1fee718eda63e9 /lib-src | |
| parent | bbdcf64f499636ba9567e8fed8f209e06380352c (diff) | |
| parent | 61febcb6e32860575316b8a539a2e9f13f70e3c2 (diff) | |
Merge from emacs-24; up to 2014-05-04T21:18:[email protected]
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 94ba8f4a9c..b16f881c4d 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2014-05-04 Paul Eggert <[email protected]> + + Handle systems without WCONTINUED consistently. (Bug#15110, 17339) + * emacsclient.c (WCONTINUED): Move to ../src/syswait.h. + 2014-04-30 Glenn Morris <[email protected]> * Makefile.in ($(DESTDIR)${archlibdir}): diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index bd0aa12183..a1177f5457 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 */ |