diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-11-17 18:46:45 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-11-17 18:46:45 +0200 |
| commit | 22bae83fa8c432780fe20202a660aa8c84f3087a (patch) | |
| tree | e58043c1a42681cc2ba63a20c5d85c84a1dbb6ad /nt/inc/ms-w32.h | |
| parent | a631d0e04747884855aa460cb903d1fd2ff106f4 (diff) | |
| download | emacs-22bae83fa8c432780fe20202a660aa8c84f3087a.tar.gz emacs-22bae83fa8c432780fe20202a660aa8c84f3087a.tar.bz2 emacs-22bae83fa8c432780fe20202a660aa8c84f3087a.zip | |
Fix bug #12829 with aborts on MS-Windows when several child processes die.
nt/inc/sys/wait.h: New file, with prototype of waitpid and
definitions of macros it needs.
nt/inc/ms-w32.h (wait): Don't define, 'wait' is not used anymore.
(sys_wait): Remove prototype.
nt/config.nt (HAVE_SYS_WAIT_H): Define to 1.
src/w32proc.c (create_child): Don't clip the PID of the child
process to fit into an Emacs integer, as this is no longer a
restriction.
(waitpid): Rename from sys_wait. Emulate a Posix 'waitpid' by
reaping only the process specified by PID argument, if that is
positive. Use PID instead of dead_child to know which process to
reap. Wait for the child to die only if WNOHANG is not in
OPTIONS.
(sys_select): Don't set dead_child.
src/sysdep.c (wait_for_termination_1): Remove the WINDOWSNT portion,
as it is no longer needed.
src/process.c (waitpid, WUNTRACED) [!WNOHANG]: Remove definitions,
no longer needed.
(record_child_status_change): Remove the setting of
record_at_most_one_child for the !WNOHANG case.
Diffstat (limited to 'nt/inc/ms-w32.h')
| -rw-r--r-- | nt/inc/ms-w32.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index 1b2a309e1be..7b16ccab069 100644 --- a/nt/inc/ms-w32.h +++ b/nt/inc/ms-w32.h @@ -183,15 +183,12 @@ extern char *getenv (); /* Subprocess calls that are emulated. */ #define spawnve sys_spawnve -#define wait sys_wait #define kill sys_kill #define signal sys_signal /* Internal signals. */ #define emacs_raise(sig) emacs_abort() -extern int sys_wait (int *); - /* termcap.c calls that are emulated. */ #define tputs sys_tputs #define tgetstr sys_tgetstr |