Port recent signal-related changes to FreeBSD.

Problem reported by Herbert J. Skuhra.
* lisp.h (block_tty_out_signal, unblock_tty_out_signal):
Move decls from here ...
* syssignal.h: ... to here, so that lisp.h doesn't depend on signal.h.

diff --git a/src/ChangeLog b/src/ChangeLog
index eb5db45534fbfa89a8a2a907cc02a6885fef6989..6ac67ca55927def584ae6c1d2713dd16ac17773c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2014-03-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Port recent signal-related changes to FreeBSD.
+       Problem reported by Herbert J. Skuhra.
+       * lisp.h (block_tty_out_signal, unblock_tty_out_signal):
+       Move decls from here ...
+       * syssignal.h: ... to here, so that lisp.h doesn't depend on signal.h.
+
 2014-03-27  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * w32term.c (x_draw_image_glyph_string): Fix computation of height

diff --git a/src/lisp.h b/src/lisp.h
index 07bf4646441a3ebf6d43cc849c318c2dc317d62b..f8b5384ceb013eebacba8afcef9d5d74b5390a4d 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4237,8 +4237,6 @@ extern void init_sigio (int);
 extern void sys_subshell (void);
 extern void sys_suspend (void);
 extern void discard_tty_input (void);
-extern void block_tty_out_signal (sigset_t *);
-extern void unblock_tty_out_signal (sigset_t const *);
 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);

diff --git a/src/syssignal.h b/src/syssignal.h
index 477ddfc2086a0d5e5fad0a2a12fadcdaca60f352..89d6c480e0cceda9a5f8769c805efc5af0c6a323 100644 (file)
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -20,6 +20,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <signal.h>
 
 extern void init_signals (bool);
+extern void block_tty_out_signal (sigset_t *);
+extern void unblock_tty_out_signal (sigset_t const *);
 
 #ifdef HAVE_PTHREAD
 #include <pthread.h>