diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2016-12-11 19:19:10 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2016-12-11 19:19:10 +0200 |
| commit | 2783e0e3899cf92910e97dc8bfda3e47b3df1478 (patch) | |
| tree | 3475105b74b6e83cf99a8eca7a3d3a7fae8276d4 /src | |
| parent | 997081634a3b6c2359226305db05c818c492a9b2 (diff) | |
| download | emacs-2783e0e3899cf92910e97dc8bfda3e47b3df1478.tar.gz emacs-2783e0e3899cf92910e97dc8bfda3e47b3df1478.tar.bz2 emacs-2783e0e3899cf92910e97dc8bfda3e47b3df1478.zip | |
Undo part of last change
* src/thread.h:
* src/keyboard.c:
* src/keyboard.h: Undo part of last change:
input_available_clear_time is again a global variable.
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 4 | ||||
| -rw-r--r-- | src/keyboard.h | 4 | ||||
| -rw-r--r-- | src/thread.h | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index cc78548abd0..1fb1d492ce6 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -319,6 +319,10 @@ static ptrdiff_t echo_length (void); /* Incremented whenever a timer is run. */ unsigned timers_run; +/* Address (if not 0) of struct timespec to zero out if a SIGIO interrupt + happens. */ +struct timespec *input_available_clear_time; + /* True means use SIGIO interrupts; false means use CBREAK mode. Default is true if INTERRUPT_INPUT is defined. */ bool interrupt_input; diff --git a/src/keyboard.h b/src/keyboard.h index 5084c39b7c1..435851f79c8 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -415,6 +415,10 @@ extern void unuse_menu_items (void); #define EVENT_HEAD_KIND(event_head) \ (Fget ((event_head), Qevent_kind)) +/* Address (if not 0) of struct timespec to zero out if a SIGIO interrupt + happens. */ +extern struct timespec *input_available_clear_time; + extern bool ignore_mouse_drag_p; extern Lisp_Object parse_modifiers (Lisp_Object); diff --git a/src/thread.h b/src/thread.h index f10824f1983..739069a630b 100644 --- a/src/thread.h +++ b/src/thread.h @@ -159,11 +159,6 @@ struct thread_state bool m_waiting_for_input; #define waiting_for_input (current_thread->m_waiting_for_input) - /* Address (if not 0) of struct timespec to zero out if a SIGIO interrupt - happens. */ - struct timespec *m_input_available_clear_time; -#define input_available_clear_time (current_thread->m_input_available_clear_time) - /* The OS identifier for this thread. */ sys_thread_t thread_id; |