diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2017-09-22 17:00:33 -0300 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@redhat.com> | 2017-09-22 17:00:33 -0300 |
| commit | 9e0703de64a6dd4deae2ebd569955f14337f2710 (patch) | |
| tree | cec45139f1febef6441deabae142c3fb3f2c61f3 /gdb/windows-nat.c | |
| parent | 13b9f79a1904081d984a64037af6457c1e3ff7b6 (diff) | |
| parent | 43573013c9836f2b91b74b9b29dac35fdb41e06b (diff) | |
| download | gdb-9e0703de64a6dd4deae2ebd569955f14337f2710.zip gdb-9e0703de64a6dd4deae2ebd569955f14337f2710.tar.gz gdb-9e0703de64a6dd4deae2ebd569955f14337f2710.tar.bz2 | |
Merge remote-tracking branch 'remotes/master' into users/aoliva/SFN
Updated local changes to binutils/testsuite/binutils-all/readelf.exp
to match the unresolved (failed to assemble) messages introduced by
Alan Modra.
Diffstat (limited to 'gdb/windows-nat.c')
| -rw-r--r-- | gdb/windows-nat.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 6a5a295..3e18944 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -1519,7 +1519,7 @@ get_windows_debug_event (struct target_ops *ops, "EXIT_PROCESS_DEBUG_EVENT")); if (!windows_initialization_done) { - target_terminal_ours (); + target_terminal::ours (); target_mourn_inferior (inferior_ptid); error (_("During startup program exited with code 0x%x."), (unsigned int) current_event.u.ExitProcess.dwExitCode); @@ -1626,7 +1626,7 @@ windows_wait (struct target_ops *ops, { int pid = -1; - target_terminal_ours (); + target_terminal::ours (); /* We loop when we get a non-standard exception rather than return with a SPURIOUS because resume can try and step or modify things, @@ -1771,8 +1771,8 @@ do_initial_windows_stuff (struct target_ops *ops, DWORD pid, int attaching) current thread until we report an event out of windows_wait. */ inferior_ptid = pid_to_ptid (pid); - target_terminal_init (); - target_terminal_inferior (); + target_terminal::init (); + target_terminal::inferior (); windows_initialization_done = 0; @@ -1912,7 +1912,7 @@ windows_attach (struct target_ops *ops, const char *args, int from_tty) } do_initial_windows_stuff (ops, pid, 1); - target_terminal_ours (); + target_terminal::ours (); } static void @@ -2959,9 +2959,6 @@ windows_target (void) return t; } -/* -Wmissing-prototypes */ -extern initialize_file_ftype _initialize_windows_nat; - void _initialize_windows_nat (void) { @@ -3130,9 +3127,6 @@ windows_thread_alive (struct target_ops *ops, ptid_t ptid) ? FALSE : TRUE; } -/* -Wmissing-prototypes */ -extern initialize_file_ftype _initialize_check_for_gdb_ini; - void _initialize_check_for_gdb_ini (void) { @@ -3227,9 +3221,6 @@ bad_GetConsoleFontSize (HANDLE w, DWORD nFont) return size; } -/* -Wmissing-prototypes */ -extern initialize_file_ftype _initialize_loadable; - /* Load any functions which may not be available in ancient versions of Windows. */ |