[Emacs-diffs] /srv/bzr/emacs/trunk r110173: Move pid_t related decls out of lisp.h.

[Paul Eggert]

------------------------------------------------------------
revno: 110173
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2012-09-23 15:25:22 -0700
message:
  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.
modified:
  src/ChangeLog
  src/callproc.c
  src/lisp.h
  src/syswait.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-23 19:36:31 +0000
+++ b/src/ChangeLog     2012-09-23 22:25:22 +0000
@@ -1,5 +1,13 @@
 2012-09-23  Paul Eggert  <address@hidden>
 
+       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):

=== modified file 'src/callproc.c'
--- a/src/callproc.c    2012-09-23 08:44:20 +0000
+++ b/src/callproc.c    2012-09-23 22:25:22 +0000
@@ -51,6 +51,7 @@
 #include "process.h"
 #include "syssignal.h"
 #include "systty.h"
+#include "syswait.h"
 #include "blockinput.h"
 #include "frame.h"
 #include "termhooks.h"

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2012-09-23 08:44:20 +0000
+++ b/src/lisp.h        2012-09-23 22:25:22 +0000
@@ -3333,7 +3333,6 @@
 #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 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);

=== modified file 'src/syswait.h'
--- a/src/syswait.h     2012-08-02 04:14:48 +0000
+++ b/src/syswait.h     2012-09-23 22:25:22 +0000
@@ -51,4 +51,11 @@
 #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 */