[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 2783e0e: Undo part of last change
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master 2783e0e: Undo part of last change |
Date: |
Sun, 11 Dec 2016 17:19:41 +0000 (UTC) |
branch: master
commit 2783e0e3899cf92910e97dc8bfda3e47b3df1478
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
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.
---
src/keyboard.c | 4 ++++
src/keyboard.h | 4 ++++
src/thread.h | 5 -----
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/keyboard.c b/src/keyboard.c
index cc78548..1fb1d49 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 5084c39..435851f 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 f10824f..739069a 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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 2783e0e: Undo part of last change,
Eli Zaretskii <=