procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle systems without WCONTINUED consistently.

Browse source 
* 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
This commit is contained in:
Paul Eggert 2014-05-03 13:13:10 -07:00
parent 8494d3796c
commit d355cad6b7
5 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib-src/ChangeLog
View file

@ -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}):

4
lib-src/emacsclient.c
View file

@ -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 */

7
src/ChangeLog
View file

@ -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.

6
src/process.c
View file

@ -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;

4
src/syswait.h
View file

@ -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