From: Andreas Schwab Date: Sun, 1 May 2011 08:52:17 +0000 (+0200) Subject: * src/sysdep.c (wait_for_termination_1): Make static. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~161 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e7a6747fd320eebb898353dae1829d3b4e1d4bfa;p=emacs.git * src/sysdep.c (wait_for_termination_1): Make static. (wait_for_termination, interruptible_wait_for_termination): Move after wait_for_termination_1. --- diff --git a/src/ChangeLog b/src/ChangeLog index 13f40887329..a88419f0b11 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-05-01 Andreas Schwab + + * sysdep.c (wait_for_termination_1): Make static. + (wait_for_termination, interruptible_wait_for_termination): Move + after wait_for_termination_1. + 2011-05-01 Lars Magne Ingebrigtsen * sysdep.c (interruptible_wait_for_termination): New function diff --git a/src/sysdep.c b/src/sysdep.c index 9a7045f3610..ea9a25cc6e7 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -296,23 +296,8 @@ init_baud_rate (int fd) int wait_debugging EXTERNALLY_VISIBLE; #ifndef MSDOS -/* Wait for subprocess with process id `pid' to terminate and - make sure it will get eliminated (not remain forever as a zombie) */ -void -wait_for_termination (int pid) -{ - wait_for_termination_1 (pid, 0); -} - -/* Like the above, but allow keyboard interruption. */ -void -interruptible_wait_for_termination (int pid) -{ - wait_for_termination_1 (pid, 1); -} - -void +static void wait_for_termination_1 (int pid, int interruptible) { while (1) @@ -357,6 +342,22 @@ wait_for_termination_1 (int pid, int interruptible) } } +/* Wait for subprocess with process id `pid' to terminate and + make sure it will get eliminated (not remain forever as a zombie) */ + +void +wait_for_termination (int pid) +{ + wait_for_termination_1 (pid, 0); +} + +/* Like the above, but allow keyboard interruption. */ +void +interruptible_wait_for_termination (int pid) +{ + wait_for_termination_1 (pid, 1); +} + /* * flush any pending output * (may flush input as well; it does not matter the way we use it)