diff options
| author | Juanma Barranquero | 2009-01-30 18:01:40 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2009-01-30 18:01:40 +0000 |
| commit | 8984df7cbdf0349d40c9f1976eec1c01d9fbb3c2 (patch) | |
| tree | 0d82301d86bc8c9f71c04b78f27297445f20e7b1 | |
| parent | 805b5d9ccf6a0f624148fa3c0fea49b5d0b69e1a (diff) | |
| download | emacs-8984df7cbdf0349d40c9f1976eec1c01d9fbb3c2.tar.gz emacs-8984df7cbdf0349d40c9f1976eec1c01d9fbb3c2.zip | |
* w32inevt.c (w32_console_read_socket) [SYNC_INPUT]:
* w32term.c (w32_read_socket) [SYNC_INPUT]:
Remove; this code is not used on Windows.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/w32inevt.c | 6 | ||||
| -rw-r--r-- | src/w32term.c | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f86e3c5afd4..1ab6abe40c3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2009-01-30 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * w32inevt.c (w32_console_read_socket) [SYNC_INPUT]: | ||
| 4 | * w32term.c (w32_read_socket) [SYNC_INPUT]: | ||
| 5 | Remove; this code is not used on Windows. | ||
| 6 | |||
| 1 | 2009-01-30 Eli Zaretskii <eliz@gnu.org> | 7 | 2009-01-30 Eli Zaretskii <eliz@gnu.org> |
| 2 | 8 | ||
| 3 | * coding.c (detect_eol, decode_eol): Handle text with DOS-style | 9 | * coding.c (detect_eol, decode_eol): Handle text with DOS-style |
diff --git a/src/w32inevt.c b/src/w32inevt.c index 7552ff17bb9..ac7ca644c54 100644 --- a/src/w32inevt.c +++ b/src/w32inevt.c | |||
| @@ -651,16 +651,10 @@ w32_console_read_socket (struct terminal *terminal, | |||
| 651 | if (interrupt_input_blocked) | 651 | if (interrupt_input_blocked) |
| 652 | { | 652 | { |
| 653 | interrupt_input_pending = 1; | 653 | interrupt_input_pending = 1; |
| 654 | #ifdef SYNC_INPUT | ||
| 655 | pending_signals = 1; | ||
| 656 | #endif | ||
| 657 | return -1; | 654 | return -1; |
| 658 | } | 655 | } |
| 659 | 656 | ||
| 660 | interrupt_input_pending = 0; | 657 | interrupt_input_pending = 0; |
| 661 | #ifdef SYNC_INPUT | ||
| 662 | pending_signals = pending_atimers; | ||
| 663 | #endif | ||
| 664 | BLOCK_INPUT; | 658 | BLOCK_INPUT; |
| 665 | 659 | ||
| 666 | for (;;) | 660 | for (;;) |
diff --git a/src/w32term.c b/src/w32term.c index 6e2f9ffa4dc..7ad7778feaa 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -4078,16 +4078,10 @@ w32_read_socket (sd, expected, hold_quit) | |||
| 4078 | if (interrupt_input_blocked) | 4078 | if (interrupt_input_blocked) |
| 4079 | { | 4079 | { |
| 4080 | interrupt_input_pending = 1; | 4080 | interrupt_input_pending = 1; |
| 4081 | #ifdef SYNC_INPUT | ||
| 4082 | pending_signals = 1; | ||
| 4083 | #endif | ||
| 4084 | return -1; | 4081 | return -1; |
| 4085 | } | 4082 | } |
| 4086 | 4083 | ||
| 4087 | interrupt_input_pending = 0; | 4084 | interrupt_input_pending = 0; |
| 4088 | #ifdef SYNC_INPUT | ||
| 4089 | pending_signals = pending_atimers; | ||
| 4090 | #endif | ||
| 4091 | BLOCK_INPUT; | 4085 | BLOCK_INPUT; |
| 4092 | 4086 | ||
| 4093 | /* So people can tell when we have read the available input. */ | 4087 | /* So people can tell when we have read the available input. */ |