diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/nat/windows-nat.c | 9 | ||||
| -rw-r--r-- | gdb/nat/windows-nat.h | 9 |
3 files changed, 15 insertions, 9 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3c3ae28..e4fe833 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2020-04-08 Tom Tromey <tromey@adacore.com> + * 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 <tromey@adacore.com> + * windows-nat.c (wait_for_debug_event): Move to nat/windows-nat.c. * nat/windows-nat.h (wait_for_debug_event): Declare. diff --git a/gdb/nat/windows-nat.c b/gdb/nat/windows-nat.c index bb28e9b..94e7f57 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_stop> pending_stops; diff --git a/gdb/nat/windows-nat.h b/gdb/nat/windows-nat.h index 846fa67..0597120 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<pending_stop> 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); |