* breakpoint.h, breakpoint.c: Ditto.

3 files changed, 15 insertions, 11 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ce14d26..622b527 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -3,6 +3,7 @@
 	* wrapper.h (struct value): Add opaque declaration.  Replace
 	value_ptr with ``struct value *''.
 	* wrapper.c: Replace value_ptr with ``struct value *''.
+	* breakpoint.h, breakpoint.c: Ditto.
 
 2001-10-20  Andrew Cagney  <ac131313@redhat.com>
 
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 6593b37..310d2d6 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -377,7 +377,7 @@ get_number_trailer (char **pp, int trailer)
          to pass to lookup_internalvar().  */
       char *varname;
       char *start = ++p;
-      value_ptr val;
+      struct value *val;
 
       while (isalnum (*p) || *p == '_')
 	p++;
@@ -866,8 +866,8 @@ insert_breakpoints (void)
       {
 	struct frame_info *saved_frame;
 	int saved_level, within_current_scope;
-	value_ptr mark = value_mark ();
-	value_ptr v;
+	struct value *mark = value_mark ();
+	struct value *v;
 
 	/* Save the current frame and level so we can restore it after
 	   evaluating the watchpoint expression on its own frame.  */
@@ -1306,7 +1306,8 @@ remove_breakpoint (struct breakpoint *b, insertion_state_t is)
 	   && b->enable_state == bp_enabled
 	   && !b->duplicate)
     {
-      value_ptr v, n;
+      struct value *v;
+      struct value *n;
 
       b->inserted = (is == mark_inserted);
       /* Walk down the saved value chain.  */
@@ -2250,7 +2251,7 @@ bpstat_print (bpstat bs)
 static int
 breakpoint_cond_eval (PTR exp)
 {
-  value_ptr mark = value_mark ();
+  struct value *mark = value_mark ();
   int i = !value_true (evaluate_expression ((struct expression *) exp));
   value_free_to_mark (mark);
   return i;
@@ -2321,8 +2322,8 @@ watchpoint_check (PTR p)
          call free_all_values.  We can't call free_all_values because
          we might be in the middle of evaluating a function call.  */
 
-      value_ptr mark = value_mark ();
-      value_ptr new_val = evaluate_expression (bs->breakpoint_at->exp);
+      struct value *mark = value_mark ();
+      struct value *new_val = evaluate_expression (bs->breakpoint_at->exp);
       if (!value_equal (b->val, new_val))
 	{
 	  release_value (new_val);
@@ -2543,7 +2544,7 @@ bpstat_stop_status (CORE_ADDR *pc, int not_a_breakpoint)
 	     b->type == bp_access_watchpoint)
       {
 	CORE_ADDR addr;
-	value_ptr v;
+	struct value *v;
 	int found = 0;
 
 	addr = target_stopped_data_address ();
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 0909c3a..44cde48 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -27,6 +27,8 @@
 
 #include "gdb-events.h"
 
+struct value;
+
 /* This is the maximum number of bytes a breakpoint instruction can take.
    Feel free to increase it.  It's just used in a few places to size
    arrays that should be independent of the target architecture.  */
@@ -249,10 +251,10 @@ struct breakpoint
        valid anywhere (e.g. consists just of global symbols).  */
     struct block *exp_valid_block;
     /* Value of the watchpoint the last time we checked it.  */
-    value_ptr val;
+    struct value *val;
 
     /* Holds the value chain for a hardware watchpoint expression.  */
-    value_ptr val_chain;
+    struct value *val_chain;
 
     /* Holds the address of the related watchpoint_scope breakpoint
        when using watchpoints on local variables (might the concept
@@ -479,7 +481,7 @@ struct bpstats
     /* Commands left to be done.  */
     struct command_line *commands;
     /* Old value associated with a watchpoint.  */
-    value_ptr old_val;
+    struct value *old_val;
 
     /* Nonzero if this breakpoint tells us to print the frame.  */
     char print;