2012-11-20 Pedro Alves <palves@redhat.com>

	* annotate.c (breakpoints_changed): Rename to ...
	(annotate_breakpoints_changed): ... this.
	(annotate_stopped, breakpoint_changed): Adjust caller.
	* annotate.h (breakpoints_changed): Rename to ...
	(annotate_breakpoints_changed): ... this.
	* breakpoint.c (set_breakpoint_condition, breakpoint_set_commands)
	(do_map_commands_command, init_raw_breakpoint, clear_command)
	(set_ignore_count, enable_breakpoint_disp): Adjust callers.

4 files changed, 22 insertions, 11 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e807ab8..9c5531f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+2012-11-20  Pedro Alves  <palves@redhat.com>
+
+	* annotate.c (breakpoints_changed): Rename to ...
+	(annotate_breakpoints_changed): ... this.
+	(annotate_stopped, breakpoint_changed): Adjust caller.
+	* annotate.h (breakpoints_changed): Rename to ...
+	(annotate_breakpoints_changed): ... this.
+	* breakpoint.c (set_breakpoint_condition, breakpoint_set_commands)
+	(do_map_commands_command, init_raw_breakpoint, clear_command)
+	(set_ignore_count, enable_breakpoint_disp): Adjust callers.
+
 2012-11-20  David S. Miller  <davem@davemloft.net>
 
 	* common/linux-osdata.c (get_number_of_cpu_cores): Delete.
diff --git a/gdb/annotate.c b/gdb/annotate.c
index cd0a94a..96902cb 100644
--- a/gdb/annotate.c
+++ b/gdb/annotate.c
@@ -50,7 +50,7 @@ print_value_flags (struct type *t)
 }
 
 void
-breakpoints_changed (void)
+annotate_breakpoints_changed (void)
 {
   if (annotation_level == 2)
     {
@@ -110,7 +110,7 @@ annotate_stopped (void)
   if (annotation_level > 1 && ignore_count_changed)
     {
       ignore_count_changed = 0;
-      breakpoints_changed ();
+      annotate_breakpoints_changed ();
     }
 }
 
@@ -563,7 +563,7 @@ annotate_array_section_end (void)
 static void
 breakpoint_changed (struct breakpoint *b)
 {
-  breakpoints_changed ();
+  annotate_breakpoints_changed ();
 }
 
 void
diff --git a/gdb/annotate.h b/gdb/annotate.h
index 0eae524..0f7b320 100644
--- a/gdb/annotate.h
+++ b/gdb/annotate.h
@@ -20,7 +20,7 @@
 #include "symtab.h"
 #include "gdbtypes.h"
 
-extern void breakpoints_changed (void);
+extern void annotate_breakpoints_changed (void);
 
 extern void annotate_ignore_count_change (void);
 extern void annotate_breakpoint (int);
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index ccf7ee1..387ddb8 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -983,7 +983,7 @@ set_breakpoint_condition (struct breakpoint *b, char *exp,
     }
   mark_breakpoint_modified (b);
 
-  breakpoints_changed ();
+  annotate_breakpoints_changed ();
   observer_notify_breakpoint_modified (b);
 }
 
@@ -1214,7 +1214,7 @@ breakpoint_set_commands (struct breakpoint *b,
 
   decref_counted_command_line (&b->commands);
   b->commands = alloc_counted_command_line (commands);
-  breakpoints_changed ();
+  annotate_breakpoints_changed ();
   observer_notify_breakpoint_modified (b);
 }
 
@@ -1331,7 +1331,7 @@ do_map_commands_command (struct breakpoint *b, void *data)
       incref_counted_command_line (info->cmd);
       decref_counted_command_line (&b->commands);
       b->commands = info->cmd;
-      breakpoints_changed ();
+      annotate_breakpoints_changed ();
       observer_notify_breakpoint_modified (b);
     }
 }
@@ -6996,7 +6996,7 @@ init_raw_breakpoint (struct breakpoint *b, struct gdbarch *gdbarch,
   if (bptype != bp_breakpoint && bptype != bp_hardware_breakpoint)
     b->pspace = sal.pspace;
 
-  breakpoints_changed ();
+  annotate_breakpoints_changed ();
 }
 
 /* set_raw_breakpoint is a low level routine for allocating and
@@ -11941,7 +11941,7 @@ clear_command (char *arg, int from_tty)
       else
 	printf_unfiltered (_("Deleted breakpoints "));
     }
-  breakpoints_changed ();
+  annotate_breakpoints_changed ();
 
   for (ix = 0; VEC_iterate(breakpoint_p, found, ix, b); ix++)
     {
@@ -14319,7 +14319,7 @@ set_ignore_count (int bptnum, int count, int from_tty)
 			       "crossings of breakpoint %d."),
 			     count, bptnum);
 	}
-      breakpoints_changed ();
+      annotate_breakpoints_changed ();
       observer_notify_breakpoint_modified (b);
       return;
     }
@@ -14584,7 +14584,7 @@ enable_breakpoint_disp (struct breakpoint *bpt, enum bpdisp disposition,
   bpt->disposition = disposition;
   bpt->enable_count = count;
   update_global_location_list (1);
-  breakpoints_changed ();
+  annotate_breakpoints_changed ();
   
   observer_notify_breakpoint_modified (bpt);
 }