Fix the gdb build with GCC 7

[deliverable/binutils-gdb.git] / gdb / p-valprint.c

diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
index c465d1455b42842fb09f1b27d64e2a36e0f0d2d2..198d6b6c3e4a3e5c858c6d936b437104b3f3d67e 100644 (file)
--- a/gdb/p-valprint.c
+++ b/gdb/p-valprint.c
@@ -240,7 +240,7 @@ pascal_val_print (struct type *type,
              if (want_space)
                fputs_filtered (" ", stream);
              fputs_filtered ("<", stream);
-             fputs_filtered (MSYMBOL_PRINT_NAME (msymbol.minsym), stream);
+             fputs_filtered (msymbol.minsym->print_name (), stream);
              fputs_filtered (">", stream);
              want_space = 1;
            }
@@ -255,8 +255,7 @@ pascal_val_print (struct type *type,
 
              if (msymbol.minsym != NULL)
                {
-                 const char *search_name
-                   = MSYMBOL_SEARCH_NAME (msymbol.minsym);
+                 const char *search_name = msymbol.minsym->search_name ();
                  wsym = lookup_symbol_search_name (search_name, NULL,
                                                    VAR_DOMAIN).symbol;
                }
@@ -866,9 +865,9 @@ pascal_object_print_static_field (struct value *val,
        {
          if (value_address (val) == first_dont_print[i])
            {
-             fputs_filtered ("\
-<same as static member of an already seen type>",
-                             stream);
+             fputs_styled (_("\
+<same as static member of an already seen type>"),
+                           metadata_style.style (), stream);
              return;
            }
        }