diff options
| author | Jan Djärv | 2004-12-23 22:17:56 +0000 |
|---|---|---|
| committer | Jan Djärv | 2004-12-23 22:17:56 +0000 |
| commit | bd55c35cc18353ce75a4661c3a06e9a7bb88ccf4 (patch) | |
| tree | 06d015454f772a3d291c251e40d1045bdbf53ddd /src | |
| parent | 11c2175c79f09ceb0a7021a71dbe9ec8686f5fe3 (diff) | |
| download | emacs-bd55c35cc18353ce75a4661c3a06e9a7bb88ccf4.tar.gz emacs-bd55c35cc18353ce75a4661c3a06e9a7bb88ccf4.zip | |
* keyboard.c (input_available_signal): Call SIGNAL_THREAD_CHECK
before touching input_available_clear_time, to avoid accessing it
from multiple threads.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/keyboard.c | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5030c115d35..83419a166a9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2004-12-23 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * keyboard.c (input_available_signal): Call SIGNAL_THREAD_CHECK | ||
| 4 | before touching input_available_clear_time, to avoid accessing it | ||
| 5 | from multiple threads. | ||
| 6 | |||
| 1 | 2004-12-23 Jason Rumney <jasonr@gnu.org> | 7 | 2004-12-23 Jason Rumney <jasonr@gnu.org> |
| 2 | 8 | ||
| 3 | * image.c (__WIN32__) [HAVE_NTGUI]: Define for correct behaviour | 9 | * image.c (__WIN32__) [HAVE_NTGUI]: Define for correct behaviour |
diff --git a/src/keyboard.c b/src/keyboard.c index f5ca087227d..1c6f3f7c5f5 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -6841,14 +6841,16 @@ input_available_signal (signo) | |||
| 6841 | sigisheld (SIGIO); | 6841 | sigisheld (SIGIO); |
| 6842 | #endif | 6842 | #endif |
| 6843 | 6843 | ||
| 6844 | if (input_available_clear_time) | ||
| 6845 | EMACS_SET_SECS_USECS (*input_available_clear_time, 0, 0); | ||
| 6846 | |||
| 6847 | #ifdef SYNC_INPUT | 6844 | #ifdef SYNC_INPUT |
| 6848 | interrupt_input_pending = 1; | 6845 | interrupt_input_pending = 1; |
| 6849 | #else | 6846 | #else |
| 6850 | |||
| 6851 | SIGNAL_THREAD_CHECK (signo); | 6847 | SIGNAL_THREAD_CHECK (signo); |
| 6848 | #endif | ||
| 6849 | |||
| 6850 | if (input_available_clear_time) | ||
| 6851 | EMACS_SET_SECS_USECS (*input_available_clear_time, 0, 0); | ||
| 6852 | |||
| 6853 | #ifndef SYNC_INPUT | ||
| 6852 | handle_async_input (); | 6854 | handle_async_input (); |
| 6853 | #endif | 6855 | #endif |
| 6854 | 6856 | ||