merge from gcc

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

diff --git a/gdb/p-lang.c b/gdb/p-lang.c
index 115bfe106fa2843f0c38d39b0615e27bf0b8e87a..3c3e645d872d4e4be5960fc1b22ad9cf662cfba8 100644 (file)
--- a/gdb/p-lang.c
+++ b/gdb/p-lang.c
@@ -1,5 +1,7 @@
 /* Pascal language support routines for GDB, the GNU debugger.
-   Copyright 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+   Copyright 2000, 2002, 2003, 2004, 2005 Free Software Foundation,
+   Inc.
 
    This file is part of GDB.
 
@@ -155,8 +157,8 @@ pascal_printchar (int c, struct ui_file *stream)
    had to stop before printing LENGTH characters, or if FORCE_ELLIPSES.  */
 
 void
-pascal_printstr (struct ui_file *stream, char *string, unsigned int length,
-                int width, int force_ellipses)
+pascal_printstr (struct ui_file *stream, const bfd_byte *string,
+                unsigned int length, int width, int force_ellipses)
 {
   unsigned int i;
   unsigned int things_printed = 0;
@@ -286,7 +288,7 @@ pascal_create_fundamental_type (struct objfile *objfile, int typeid)
       type = init_type (TYPE_CODE_INT,
                        TARGET_INT_BIT / TARGET_CHAR_BIT,
                        0, "<?type?>", objfile);
-      warning ("internal error: no Pascal fundamental type %d", typeid);
+      warning (_("internal error: no Pascal fundamental type %d"), typeid);
       break;
     case FT_VOID:
       type = init_type (TYPE_CODE_VOID,
@@ -451,6 +453,7 @@ const struct language_defn pascal_language_defn =
   range_check_on,
   type_check_on,
   case_sensitive_on,
+  array_row_major,
   &exp_descriptor_standard,
   pascal_parse,
   pascal_error,
@@ -468,10 +471,6 @@ const struct language_defn pascal_language_defn =
   basic_lookup_transparent_type,/* lookup_transparent_type */
   NULL,                                /* Language specific symbol demangler */
   NULL,                                /* Language specific class_name_from_physname */
-  {"", "%", "b", ""},          /* Binary format info */
-  {"0%lo", "0", "o", ""},      /* Octal format info */
-  {"%ld", "", "d", ""},                /* Decimal format info */
-  {"$%lx", "$", "x", ""},      /* Hex format info */
   pascal_op_print_tab,         /* expression operators for printing */
   1,                           /* c-style arrays */
   0,                           /* String lower bound */