diff options
| author | Paul Eggert | 2014-03-27 15:52:14 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-03-27 15:52:14 -0700 |
| commit | 4e74624db143b93fbc3829b0af17da26b4ea6fb6 (patch) | |
| tree | cf815bd90f80803aadcd994fe1ad3e0e3728a93e | |
| parent | ef9b8f2d5394f88e2170e417750ae2cc4777eb43 (diff) | |
| download | emacs-4e74624db143b93fbc3829b0af17da26b4ea6fb6.tar.gz emacs-4e74624db143b93fbc3829b0af17da26b4ea6fb6.zip | |
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.
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/lisp.h | 2 | ||||
| -rw-r--r-- | src/syssignal.h | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index eb5db45534f..6ac67ca5592 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2014-03-27 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Port recent signal-related changes to FreeBSD. | ||
| 4 | Problem reported by Herbert J. Skuhra. | ||
| 5 | * lisp.h (block_tty_out_signal, unblock_tty_out_signal): | ||
| 6 | Move decls from here ... | ||
| 7 | * syssignal.h: ... to here, so that lisp.h doesn't depend on signal.h. | ||
| 8 | |||
| 1 | 2014-03-27 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 9 | 2014-03-27 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
| 2 | 10 | ||
| 3 | * w32term.c (x_draw_image_glyph_string): Fix computation of height | 11 | * w32term.c (x_draw_image_glyph_string): Fix computation of height |
diff --git a/src/lisp.h b/src/lisp.h index 07bf4646441..f8b5384ceb0 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -4237,8 +4237,6 @@ extern void init_sigio (int); | |||
| 4237 | extern void sys_subshell (void); | 4237 | extern void sys_subshell (void); |
| 4238 | extern void sys_suspend (void); | 4238 | extern void sys_suspend (void); |
| 4239 | extern void discard_tty_input (void); | 4239 | extern void discard_tty_input (void); |
| 4240 | extern void block_tty_out_signal (sigset_t *); | ||
| 4241 | extern void unblock_tty_out_signal (sigset_t const *); | ||
| 4242 | extern void init_sys_modes (struct tty_display_info *); | 4240 | extern void init_sys_modes (struct tty_display_info *); |
| 4243 | extern void reset_sys_modes (struct tty_display_info *); | 4241 | extern void reset_sys_modes (struct tty_display_info *); |
| 4244 | extern void init_all_sys_modes (void); | 4242 | extern void init_all_sys_modes (void); |
diff --git a/src/syssignal.h b/src/syssignal.h index 477ddfc2086..89d6c480e0c 100644 --- a/src/syssignal.h +++ b/src/syssignal.h | |||
| @@ -20,6 +20,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 20 | #include <signal.h> | 20 | #include <signal.h> |
| 21 | 21 | ||
| 22 | extern void init_signals (bool); | 22 | extern void init_signals (bool); |
| 23 | extern void block_tty_out_signal (sigset_t *); | ||
| 24 | extern void unblock_tty_out_signal (sigset_t const *); | ||
| 23 | 25 | ||
| 24 | #ifdef HAVE_PTHREAD | 26 | #ifdef HAVE_PTHREAD |
| 25 | #include <pthread.h> | 27 | #include <pthread.h> |