Mercurial > emacs
diff src/callproc.c @ 109378:4e99d7aa7526
Remove more "#ifdef subprocesses".
process.c <inhibit_sentinels>: Move to the common part.
(Fwaiting_for_user_input_p): Move to the common part; return nil
if async subprocesses aren't supported.
sysdep.c (wait_for_termination) [!MSDOS]: Don't compile on
MS-DOS. Remove "#ifdef subprocesses".
(sys_subshell, sys_select): Remove "#ifdef subprocesses".
(gettimeofday): Remove "#ifdef subprocesses".
(wait_without_blocking): Remove function.
(flush_pending_output, child_setup_tty): Don't compile on MS-DOS.
Remove "#ifdef subprocesses".
(child_setup_tty): Use WINDOWSNT instead of DOS_NT, since not
compiled on MS-DOS.
callproc.c (Fcall_process) [!MSDOS]: Don't call
wait_for_termination on MS-DOS.
emacs.c (shut_down_emacs): Remove "#ifndef subprocesses" from
initialization of inhibit_sentinels.
keyboard.c (record_asynch_buffer_change): Remove "#ifdef
subprocesses" conditional.
callproc.c (Fcall_process) [!subprocesses]: Don't call
wait_for_termination, since `buffer' cannot be an integer when
async subprocesses are not supported
xdisp.c (decode_mode_spec): Use `MSDOS' instead of `subprocesses'
for ifdefing away the call to Fprocess_status.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Tue, 13 Jul 2010 13:57:00 +0300 |
parents | 9cfc1b90afea |
children | 68ca98ae70fb |
line wrap: on
line diff
--- a/src/callproc.c Tue Jul 13 13:03:22 2010 +0300 +++ b/src/callproc.c Tue Jul 13 13:57:00 2010 +0300 @@ -612,12 +612,6 @@ { if (fd[0] >= 0) emacs_close (fd[0]); -#ifndef subprocesses - /* If Emacs has been built with asynchronous subprocess support, - we don't need to do this, I think because it will then have - the facilities for handling SIGCHLD. */ - wait_without_blocking (); -#endif /* subprocesses */ return Qnil; } @@ -811,8 +805,10 @@ make_number (total_read)); } +#ifndef MSDOS /* Wait for it to terminate, unless it already has. */ wait_for_termination (pid); +#endif immediate_quit = 0;