2008-08-06 Phil Muldoon <pmuldoon@redhat.com>

	* breakpoint.c (hw_breakpoint_used_count): Use breakpoint_enabled.
	(insert_breakpoint_locations): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6da4d0b5904064cfb9ab96591512aecadfdc4775..a6babecc35c6c48e6fc47df182c23dee3d651d66 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-06  Phil Muldoon  <pmuldoon@redhat.com>
+
+       * breakpoint.c (hw_breakpoint_used_count): Use breakpoint_enabled.
+       (insert_breakpoint_locations): Likewise.
+
 2008-08-05  Phil Muldoon  <pmuldoon@redhat.com>
 
        * breakpoint.c (create_longjmp_breakpoint): Remove unused struct

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 05fe72629754acd22a25de81630d7bb09cd5b0c2..2a10d619c9e1da9f6a8b37f6f58cfaf5deb5facd 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -1320,7 +1320,7 @@ insert_breakpoint_locations (void)
       if (!is_hardware_watchpoint (bpt))
        continue;
 
-      if (bpt->enable_state != bp_enabled)
+      if (!breakpoint_enabled (bpt))
        continue;
 
       if (bpt->disposition == disp_del_at_next_stop)
@@ -4765,7 +4765,7 @@ hw_breakpoint_used_count (void)
 
   ALL_BREAKPOINTS (b)
   {
-    if (b->type == bp_hardware_breakpoint && b->enable_state == bp_enabled)
+    if (b->type == bp_hardware_breakpoint && breakpoint_enabled (b))
       i++;
   }