diff options
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/callproc.c | 1 | ||||
| -rw-r--r-- | src/lisp.h | 3 | ||||
| -rw-r--r-- | src/syswait.h | 7 |
4 files changed, 16 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index edf77f55331..6cd3183f191 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,13 @@ 2012-09-23 Paul Eggert <eggert@cs.ucla.edu> + Move pid_t related decls out of lisp.h. + * lisp.h, syswait.h (record_child_status_change, wait_for_termination) + (interruptible_wait_for_termination): + Move these decls from lisp.h to syswait.h, since they use pid_t. + Needed on FreeBSD; see Herbert J. Skuhra in + <http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00571.html>. + * callproc.c: Include syswait.h. + gnutls.c, gtkutil.c: Use bool for boolean. * gnutls.c (gnutls_global_initialized, init_gnutls_functions) (emacs_gnutls_handle_error): diff --git a/src/callproc.c b/src/callproc.c index fc3eb943433..b33882e54c2 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -51,6 +51,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include "process.h" #include "syssignal.h" #include "systty.h" +#include "syswait.h" #include "blockinput.h" #include "frame.h" #include "termhooks.h" diff --git a/src/lisp.h b/src/lisp.h index 7a23ba6165f..cce7b52cfe5 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -3333,7 +3333,6 @@ extern int wait_reading_process_output (intmax_t, int, int, int, #endif extern void add_keyboard_wait_descriptor (int); extern void delete_keyboard_wait_descriptor (int); -extern void record_child_status_change (pid_t, int); #ifdef HAVE_GPM extern void add_gpm_wait_descriptor (int); extern void delete_gpm_wait_descriptor (int); @@ -3421,8 +3420,6 @@ extern void init_sys_modes (struct tty_display_info *); extern void reset_sys_modes (struct tty_display_info *); extern void init_all_sys_modes (void); extern void reset_all_sys_modes (void); -extern void wait_for_termination (pid_t); -extern void interruptible_wait_for_termination (pid_t); extern void flush_pending_output (int) ATTRIBUTE_CONST; extern void child_setup_tty (int); extern void setup_pty (int); diff --git a/src/syswait.h b/src/syswait.h index 9d84876d4be..aa4c4bcf527 100644 --- a/src/syswait.h +++ b/src/syswait.h @@ -51,4 +51,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define WTERMSIG(status) ((status) & 0x7f) #endif +/* Defined in process.c. */ +extern void record_child_status_change (pid_t, int); + +/* Defined in sysdep.c. */ +extern void wait_for_termination (pid_t); +extern void interruptible_wait_for_termination (pid_t); + #endif /* EMACS_SYSWAIT_H */ |