* linux-low.c (fetch_register, usr_store_inferior_registers): Handle

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

diff --git a/gdb/varobj.c b/gdb/varobj.c
index 8532a7cfd613aa5dc1a5b10470ee38cb234c9bc6..31d8fd2c13ac8090988f9c31f7b4e3e4efc73a0e 100644 (file)
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -1450,9 +1450,9 @@ variable_default_display (struct varobj *var)
    can't be established, *ERROR2 is set to non-zero.  */
 
 static int
-my_value_equal (struct value *val1, struct value *val2, int *error2)
+my_value_equal (struct value *val1, struct value *volatile val2, int *error2)
 {
-  volatile struct exception except;
+  volatile struct gdb_exception except;
 
   /* As a special case, if both are null, we say they're equal.  */
   if (val1 == NULL && val2 == NULL)
@@ -2080,10 +2080,8 @@ c_value_of_variable (struct varobj *var)
 
            if (value_lazy (var->value))
              gdb_value_fetch_lazy (var->value);
-           val_print (value_type (var->value),
-                      value_contents_raw (var->value), 0,
-                      VALUE_ADDRESS (var->value), stb,
-                      format_code[(int) var->format], 1, 0, 0);
+           common_val_print (var->value, stb,
+                             format_code[(int) var->format], 1, 0, 0);
            thevalue = ui_file_xstrdup (stb, &dummy);
            do_cleanups (old_chain);
        return thevalue;