[PATCH] Update after changes in pretty printing

[Roland Schwingel <roland@onevision.com>]

[-- Attachment #1: Type: text/plain, Size: 586 bytes --]

Hi...

Last week some changes to base gdb have been made in regard of
the former prettyprinting. It is now called prettyformatting.

This breaks the build of insight. Here is a small patch
to adapt to these changes.

Roland

Changelog:

2013-07-15  Roland Schwingel  <roland.schwingel@onevision.com>

     * generic/gdbtk-register.c (get_register): Update
     to reflect changes from upstream gdb. Prettyprinting
     becomes prettyformatting now.
     * generic/gdbtk-wrapper.c (GDB_val_print,wrap_val_print):
     Likewise.
     * generic/gdbtk-wrapper.h (GDB_val_print): Likewise.


[-- Attachment #2: gdbtk_prettyformat.patch --]
[-- Type: text/plain, Size: 2242 bytes --]

diff -ruN generic_old/gdbtk-register.c generic/gdbtk-register.c
--- generic_old/gdbtk-register.c	2013-07-04 11:16:34.000000000 +0200
+++ generic/gdbtk-register.c	2013-07-15 08:28:26.831725500 +0200
@@ -340,7 +340,7 @@
 
       get_formatted_print_options (&opts, format);
       opts.deref_ref = 1;
-      opts.pretty = Val_pretty_default;
+      opts.prettyformat = Val_prettyformat_default;
       val_print (reg_vtype, value_contents_for_printing (val),
 		 value_embedded_offset (val), 0,
 		 stb, 0, val, &opts, current_language);
diff -ruN generic_old/gdbtk-wrapper.c generic/gdbtk-wrapper.c
--- generic_old/gdbtk-wrapper.c	2013-07-04 11:16:35.000000000 +0200
+++ generic/gdbtk-wrapper.c	2013-07-15 08:31:21.349455600 +0200
@@ -41,7 +41,7 @@
 gdb_result GDB_val_print (struct type *type, char *valaddr,
 			  CORE_ADDR address, struct ui_file *stream,
 			  int format, int deref_ref, int recurse,
-			  enum val_prettyprint pretty);
+			  enum val_prettyformat pretty);
 
 gdb_result GDB_value_equal (value_ptr, value_ptr, int *);
 
@@ -184,7 +184,7 @@
 	       int format,
 	       int deref_ref,
 	       int recurse,
-	       enum val_prettyprint pretty)
+	       enum val_prettyformat pretty)
 {
   struct gdb_wrapper_arguments args;
 
@@ -220,7 +220,7 @@
   get_formatted_print_options (&opts, format);
   opts.deref_ref = (*args)->args[5].integer;
   recurse = (*args)->args[6].integer;
-  opts.pretty = (enum val_prettyprint) (*args)->args[7].integer;
+  opts.prettyformat = (enum val_prettyformat) (*args)->args[7].integer;
 
   val_print (type, valaddr, 0, address, stream, recurse, NULL, &opts,
              current_language);
diff -ruN generic_old/gdbtk-wrapper.h generic/gdbtk-wrapper.h
--- generic_old/gdbtk-wrapper.h	2012-08-08 15:40:33.000000000 +0200
+++ generic/gdbtk-wrapper.h	2013-07-15 08:29:48.358060400 +0200
@@ -60,7 +60,7 @@
 extern gdb_result GDB_val_print (struct type *type, char *valaddr,
 				 CORE_ADDR address, struct ui_file *stream,
 				 int format, int deref_ref, int recurse,
-				 enum val_prettyprint pretty);
+				 enum val_prettyformat pretty);
 extern gdb_result GDB_value_fetch_lazy (value_ptr value);
 extern gdb_result GDB_value_equal (value_ptr val1, value_ptr val2,
 				   int *result);