diff options
| author | Eli Zaretskii | 2021-11-17 20:33:40 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2021-11-17 20:33:40 +0200 |
| commit | bf04c19cdd08baa5e5e90ccdba8aa9c0449c7fab (patch) | |
| tree | d425cff521028ee373b13165ca477176278f3a7d /src | |
| parent | d4e2915dab13da38ce2b7ab63b5c8b0ffb9b9df8 (diff) | |
| download | emacs-bf04c19cdd08baa5e5e90ccdba8aa9c0449c7fab.tar.gz emacs-bf04c19cdd08baa5e5e90ccdba8aa9c0449c7fab.zip | |
Fix recent changes related to USABLE_SIGIO
* src/process.c (wait_reading_process_output) [WINDOWSNT]:
* src/keyboard.c (handle_async_input) [DOS_NT]: Ifdef away the
code that is not needed on MS-Windows. (Bug#50403) (Bug#51820)
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 2 | ||||
| -rw-r--r-- | src/process.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 5a43e9a46aa..c3bc8307d7f 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -7180,6 +7180,7 @@ tty_read_avail_input (struct terminal *terminal, | |||
| 7180 | static void | 7180 | static void |
| 7181 | handle_async_input (void) | 7181 | handle_async_input (void) |
| 7182 | { | 7182 | { |
| 7183 | #ifndef DOS_NT | ||
| 7183 | while (1) | 7184 | while (1) |
| 7184 | { | 7185 | { |
| 7185 | int nread = gobble_input (); | 7186 | int nread = gobble_input (); |
| @@ -7189,6 +7190,7 @@ handle_async_input (void) | |||
| 7189 | if (nread <= 0) | 7190 | if (nread <= 0) |
| 7190 | break; | 7191 | break; |
| 7191 | } | 7192 | } |
| 7193 | #endif | ||
| 7192 | } | 7194 | } |
| 7193 | 7195 | ||
| 7194 | void | 7196 | void |
diff --git a/src/process.c b/src/process.c index 808bf6f1ff9..a00426795b8 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -5588,7 +5588,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 5588 | timeout = make_timespec (0, 0); | 5588 | timeout = make_timespec (0, 0); |
| 5589 | #endif | 5589 | #endif |
| 5590 | 5590 | ||
| 5591 | #ifndef USABLE_SIGIO | 5591 | #if !defined USABLE_SIGIO && !defined WINDOWSNT |
| 5592 | /* If we're polling for input, don't get stuck in select for | 5592 | /* If we're polling for input, don't get stuck in select for |
| 5593 | more than 25 msec. */ | 5593 | more than 25 msec. */ |
| 5594 | struct timespec short_timeout = make_timespec (0, 25000000); | 5594 | struct timespec short_timeout = make_timespec (0, 25000000); |