From 71fbdbafe07a4edb2ac88705e03e2cb14b3c77da Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 8 Apr 2020 14:33:35 -0600 Subject: [PATCH] Make last_wait_event static Now that last_wait_event is entirely handled in nat/windows-nat.c, it can be made static. gdb/ChangeLog 2020-04-08 Tom Tromey * nat/windows-nat.h (last_wait_event): Don't declare. (wait_for_debug_event): Update comment. * nat/windows-nat.c (last_wait_event): Now static. --- gdb/ChangeLog | 6 ++++++ gdb/nat/windows-nat.c | 9 ++++++++- gdb/nat/windows-nat.h | 9 +-------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3c3ae28dd85..e4fe833cf83 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2020-04-08 Tom Tromey + + * nat/windows-nat.h (last_wait_event): Don't declare. + (wait_for_debug_event): Update comment. + * nat/windows-nat.c (last_wait_event): Now static. + 2020-04-08 Tom Tromey * windows-nat.c (wait_for_debug_event): Move to diff --git a/gdb/nat/windows-nat.c b/gdb/nat/windows-nat.c index bb28e9b13c7..94e7f572c0a 100644 --- a/gdb/nat/windows-nat.c +++ b/gdb/nat/windows-nat.c @@ -31,7 +31,14 @@ DWORD current_process_id; DWORD main_thread_id; enum gdb_signal last_sig = GDB_SIGNAL_0; DEBUG_EVENT current_event; -DEBUG_EVENT last_wait_event; + +/* The most recent event from WaitForDebugEvent. Unlike + current_event, this is guaranteed never to come from a pending + stop. This is important because only data from the most recent + event from WaitForDebugEvent can be used when calling + ContinueDebugEvent. */ +static DEBUG_EVENT last_wait_event; + windows_thread_info *current_windows_thread; DWORD desired_stop_thread_id = -1; std::vector pending_stops; diff --git a/gdb/nat/windows-nat.h b/gdb/nat/windows-nat.h index 846fa67f407..0597120c218 100644 --- a/gdb/nat/windows-nat.h +++ b/gdb/nat/windows-nat.h @@ -165,13 +165,6 @@ extern enum gdb_signal last_sig; stop. */ extern DEBUG_EVENT current_event; -/* The most recent event from WaitForDebugEvent. Unlike - current_event, this is guaranteed never to come from a pending - stop. This is important because only data from the most recent - event from WaitForDebugEvent can be used when calling - ContinueDebugEvent. */ -extern DEBUG_EVENT last_wait_event; - /* Info on currently selected thread */ extern windows_thread_info *current_windows_thread; @@ -245,7 +238,7 @@ extern gdb::optional fetch_pending_stop (bool debug_events); extern BOOL continue_last_debug_event (DWORD continue_status, bool debug_events); -/* A simple wrapper for WaitForDebugEvent that also sets +/* A simple wrapper for WaitForDebugEvent that also sets the internal 'last_wait_event' on success. */ extern BOOL wait_for_debug_event (DEBUG_EVENT *event, DWORD timeout); -- 2.30.2