* gdb.texinfo (Target Description Format): Add version attribute

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

diff --git a/gdb/annotate.c b/gdb/annotate.c
index 7dce742e511692cce34accd32cc22db3a881fe5a..cd792a82db696b39d1ac72486f4f37035455e651 100644 (file)
--- a/gdb/annotate.c
+++ b/gdb/annotate.c
@@ -1,6 +1,6 @@
 /* Annotation routines for GDB.
-   Copyright 1986, 1989, 1990, 1991, 1992, 1994, 1995, 1996, 1998, 1999,
-   2000 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1989, 1990, 1991, 1992, 1994, 1995, 1996, 1998, 1999,
+   2000, 2007 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -16,8 +16,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #include "defs.h"
 #include "annotate.h"
@@ -55,7 +55,7 @@ print_value_flags (struct type *t)
 void
 breakpoints_changed (void)
 {
-  if (annotation_level > 1)
+  if (annotation_level == 2)
     {
       target_terminal_ours ();
       printf_unfiltered (("\n\032\032breakpoints-invalid\n"));
@@ -228,7 +228,7 @@ annotate_breakpoints_table_end (void)
 void
 annotate_frames_invalid (void)
 {
-  if (annotation_level > 1)
+  if (annotation_level == 2)
     {
       target_terminal_ours ();
       printf_unfiltered (("\n\032\032frames-invalid\n"));
@@ -423,17 +423,17 @@ annotate_source (char *filename, int line, int character, int mid, CORE_ADDR pc)
   printf_filtered (("%s:%d:%d:%s:0x"), filename,
                   line, character,
                   mid ? "middle" : "beg");
-  print_address_numeric (pc, 0, gdb_stdout);
+  deprecated_print_address_numeric (pc, 0, gdb_stdout);
   printf_filtered (("\n"));
 }
 
 void
 annotate_frame_begin (int level, CORE_ADDR pc)
 {
-  if (annotation_level == 2)
+  if (annotation_level > 1)
     {
       printf_filtered (("\n\032\032frame-begin %d 0x"), level);
-      print_address_numeric (pc, 0, gdb_stdout);
+      deprecated_print_address_numeric (pc, 0, gdb_stdout);
       printf_filtered (("\n"));
     }
 }
@@ -577,7 +577,7 @@ breakpoint_changed (struct breakpoint *b)
 void
 _initialize_annotate (void)
 {
-  if (annotation_level > 1)
+  if (annotation_level == 2)
     {
       deprecated_delete_breakpoint_hook = breakpoint_changed;
       deprecated_modify_breakpoint_hook = breakpoint_changed;