From c08790597c54c015ecfcd7ea56ebe30fa1d9e946 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 17 Nov 2015 15:17:45 +0000 Subject: [PATCH] [C++/mingw] handle_output_debug_string Fixes: ../../../src/gdb/gdbserver/win32-low.c: In function 'int win32_kill(int)': ../../../src/gdb/gdbserver/win32-low.c:823:46: error: invalid conversion from 'int' to 'target_waitkind' [-fpermissive] struct target_waitstatus our_status = { 0 }; ^ handle_output_debug_string doesn't use the parameter for anything (it's an output parameter in the gdb version), so just remove it. gdb/gdbserver/ChangeLog: 2015-11-17 Pedro Alves * win32-low.c (handle_output_debug_string): Remove parameter. (win32_kill): Remove our_status local and adjust call to handle_output_debug_string. (get_child_debug_event): Adjust call to handle_output_debug_string. --- gdb/gdbserver/ChangeLog | 8 ++++++++ gdb/gdbserver/win32-low.c | 9 +++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 2471dc1..589897d 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,11 @@ +2015-11-17 Pedro Alves + + * win32-low.c (handle_output_debug_string): Remove parameter. + (win32_kill): Remove our_status local and adjust call to + handle_output_debug_string. + (get_child_debug_event): Adjust call to + handle_output_debug_string. + 2015-11-03 Simon Marchi * linux-mips-low.c (mips_fill_gregset): Add cast. diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c index 2b40ca3..b1a2e56 100644 --- a/gdb/gdbserver/win32-low.c +++ b/gdb/gdbserver/win32-low.c @@ -747,7 +747,7 @@ win32_attach (unsigned long pid) /* Handle OUTPUT_DEBUG_STRING_EVENT from child process. */ static void -handle_output_debug_string (struct target_waitstatus *ourstatus) +handle_output_debug_string (void) { #define READ_BUFFER_LEN 1024 CORE_ADDR addr; @@ -819,10 +819,7 @@ win32_kill (int pid) if (current_event.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break; else if (current_event.dwDebugEventCode == OUTPUT_DEBUG_STRING_EVENT) - { - struct target_waitstatus our_status = { 0 }; - handle_output_debug_string (&our_status); - } + handle_output_debug_string (); } win32_clear_inferiors (); @@ -1572,7 +1569,7 @@ get_child_debug_event (struct target_waitstatus *ourstatus) "for pid=%u tid=%x\n", (unsigned) current_event.dwProcessId, (unsigned) current_event.dwThreadId)); - handle_output_debug_string (ourstatus); + handle_output_debug_string (); break; default: -- 2.7.4