From 51a5cd9059b96a2ac33cf149d369db12b891fd96 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 19 Apr 2013 15:24:55 +0000 Subject: Cast result of obstack_base to gdb_byte * in a couple spots. obstack_base returns char *. Need to cast to gdb_byte * in a couple spots. gdb/ 2013-04-19 Pedro Alves * c-lang.c (evaluate_subexp_c): Cast result of obstack_base to gdb_byte *. * linux-tdep.c (linux_make_mappings_corefile_notes): Likewise. --- gdb/ChangeLog | 6 ++++++ gdb/c-lang.c | 2 +- gdb/linux-tdep.c | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 122cfb4178a..4ca6617bf56 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2013-04-19 Pedro Alves + + * c-lang.c (evaluate_subexp_c): Cast result of obstack_base to + gdb_byte *. + * linux-tdep.c (linux_make_mappings_corefile_notes): Likewise. + 2013-04-19 Pedro Alves * alpha-tdep.c (alpha_extract_return_value): Use diff --git a/gdb/c-lang.c b/gdb/c-lang.c index 6f9d392d8a8..48a1fb02be9 100644 --- a/gdb/c-lang.c +++ b/gdb/c-lang.c @@ -658,7 +658,7 @@ evaluate_subexp_c (struct type *expect_type, struct expression *exp, if (obstack_object_size (&output) != TYPE_LENGTH (type)) error (_("Could not convert character " "constant to target character set")); - value = unpack_long (type, obstack_base (&output)); + value = unpack_long (type, (gdb_byte *) obstack_base (&output)); result = value_from_longest (type, value); } else diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c index 9623d190ae8..bfb64049bc4 100644 --- a/gdb/linux-tdep.c +++ b/gdb/linux-tdep.c @@ -993,8 +993,8 @@ linux_make_mappings_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, if (mapping_data.file_count != 0) { /* Write the count to the obstack. */ - pack_long (obstack_base (&data_obstack), long_type, - mapping_data.file_count); + pack_long ((gdb_byte *) obstack_base (&data_obstack), + long_type, mapping_data.file_count); /* Copy the filenames to the data obstack. */ obstack_grow (&data_obstack, obstack_base (&filename_obstack), -- cgit v1.2.1