diff options
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/process.c b/src/process.c index a00426795b8..241ffe9a8dd 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -259,7 +259,7 @@ static bool process_output_skip; | |||
| 259 | 259 | ||
| 260 | static void start_process_unwind (Lisp_Object); | 260 | static void start_process_unwind (Lisp_Object); |
| 261 | static void create_process (Lisp_Object, char **, Lisp_Object); | 261 | static void create_process (Lisp_Object, char **, Lisp_Object); |
| 262 | #ifdef USABLE_SIGIO | 262 | #if defined (USABLE_SIGIO) || defined (USABLE_SIGPOLL) |
| 263 | static bool keyboard_bit_set (fd_set *); | 263 | static bool keyboard_bit_set (fd_set *); |
| 264 | #endif | 264 | #endif |
| 265 | static void deactivate_process (Lisp_Object); | 265 | static void deactivate_process (Lisp_Object); |
| @@ -5730,7 +5730,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 5730 | if (! NILP (wait_for_cell) && ! NILP (XCAR (wait_for_cell))) | 5730 | if (! NILP (wait_for_cell) && ! NILP (XCAR (wait_for_cell))) |
| 5731 | break; | 5731 | break; |
| 5732 | 5732 | ||
| 5733 | #ifdef USABLE_SIGIO | 5733 | #if defined (USABLE_SIGIO) || defined (USABLE_SIGPOLL) |
| 5734 | /* If we think we have keyboard input waiting, but didn't get SIGIO, | 5734 | /* If we think we have keyboard input waiting, but didn't get SIGIO, |
| 5735 | go read it. This can happen with X on BSD after logging out. | 5735 | go read it. This can happen with X on BSD after logging out. |
| 5736 | In that case, there really is no input and no SIGIO, | 5736 | In that case, there really is no input and no SIGIO, |
| @@ -5738,7 +5738,11 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 5738 | 5738 | ||
| 5739 | if (read_kbd && interrupt_input | 5739 | if (read_kbd && interrupt_input |
| 5740 | && keyboard_bit_set (&Available) && ! noninteractive) | 5740 | && keyboard_bit_set (&Available) && ! noninteractive) |
| 5741 | #ifdef USABLE_SIGIO | ||
| 5741 | handle_input_available_signal (SIGIO); | 5742 | handle_input_available_signal (SIGIO); |
| 5743 | #else | ||
| 5744 | handle_input_available_signal (SIGPOLL); | ||
| 5745 | #endif | ||
| 5742 | #endif | 5746 | #endif |
| 5743 | 5747 | ||
| 5744 | /* If checking input just got us a size-change event from X, | 5748 | /* If checking input just got us a size-change event from X, |
| @@ -7732,7 +7736,7 @@ delete_gpm_wait_descriptor (int desc) | |||
| 7732 | 7736 | ||
| 7733 | # endif | 7737 | # endif |
| 7734 | 7738 | ||
| 7735 | # ifdef USABLE_SIGIO | 7739 | #if defined (USABLE_SIGIO) || defined (USABLE_SIGPOLL) |
| 7736 | 7740 | ||
| 7737 | /* Return true if *MASK has a bit set | 7741 | /* Return true if *MASK has a bit set |
| 7738 | that corresponds to one of the keyboard input descriptors. */ | 7742 | that corresponds to one of the keyboard input descriptors. */ |