gdb/riscv: Additional print format string fixes

[deliverable/binutils-gdb.git] / gdb / annotate.c

diff --git a/gdb/annotate.c b/gdb/annotate.c
index 64175a442b99d2654ed09759dfcbb5dfcfe29150..0c70ff9553a07ba65c0f73cf692f5f8830420174 100644 (file)
--- a/gdb/annotate.c
+++ b/gdb/annotate.c
@@ -1,5 +1,5 @@
 /* Annotation routines for GDB.
-   Copyright (C) 1986-2016 Free Software Foundation, Inc.
+   Copyright (C) 1986-2018 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -30,8 +30,6 @@
 
 /* Prototypes for local functions.  */
 
-extern void _initialize_annotate (void);
-
 static void print_value_flags (struct type *);
 
 static void breakpoint_changed (struct breakpoint *b);
@@ -65,14 +63,14 @@ annotate_breakpoints_invalid (void)
     {
       /* If the inferior owns the terminal (e.g., we're resuming),
         make sure to leave with the inferior still owning it.  */
-      int was_inferior = target_terminal_is_inferior ();
+      int was_inferior = target_terminal::is_inferior ();
 
-      target_terminal_ours_for_output ();
+      target_terminal::ours_for_output ();
 
       printf_unfiltered (("\n\032\032breakpoints-invalid\n"));
 
       if (was_inferior)
-       target_terminal_inferior ();
+       target_terminal::inferior ();
 
       breakpoints_invalid_emitted = 1;
     }
@@ -212,14 +210,14 @@ annotate_frames_invalid (void)
     {
       /* If the inferior owns the terminal (e.g., we're resuming),
         make sure to leave with the inferior still owning it.  */
-      int was_inferior = target_terminal_is_inferior ();
+      int was_inferior = target_terminal::is_inferior ();
 
-      target_terminal_ours_for_output ();
+      target_terminal::ours_for_output ();
 
       printf_unfiltered (("\n\032\032frames-invalid\n"));
 
       if (was_inferior)
-       target_terminal_inferior ();
+       target_terminal::inferior ();
 
       frames_invalid_emitted = 1;
     }