From 2b2798cc9716f45f752ea03411b6f9c9afc17cc6 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 15 Apr 2016 17:08:53 +0100 Subject: [PATCH] Fix gdb build with --enable-build-with-cxx --disable-nls MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Compiling gdb with --enable-build-with-cxx --disable-nls, we get: .../src/gdb/ada-lang.c:7657:16: error: invalid conversion from ‘const char*’ to ‘char*’ [-fpermissive] type_str = (type != NULL ^ In file included from .../src/gdb/common/common-defs.h:67:0, from .../src/gdb/defs.h:28, from .../src/gdb/ada-lang.c:21: .../src/gdb/common/gdb_locale.h:40:27: error: invalid conversion from ‘const char*’ to ‘char*’ [-fpermissive] # define _(String) (String) ^ .../src/gdb/ada-lang.c:7730:46: note: in expansion of macro ‘_’ char *name_str = name != NULL ? name : _(""); ^ Makefile:1140: recipe for target 'ada-lang.o' failed gdb/ChangeLog: 2016-04-15 Pedro Alves * ada-lang.c (ada_lookup_struct_elt_type): Constify 'type_str' and 'name_str' locals. --- gdb/ChangeLog | 5 +++++ gdb/ada-lang.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f879b8a..c83cd02 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2016-04-15 Pedro Alves + * ada-lang.c (ada_lookup_struct_elt_type): Constify 'type_str' and + 'name_str' locals. + +2016-04-15 Pedro Alves + * btrace.c (pt_btrace_insn_flags): Change return type to btrace_insn_flags. Use btrace_insn_flags for local. diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 7cdb693..d01660a 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -7649,7 +7649,7 @@ ada_lookup_struct_elt_type (struct type *type, char *name, int refok, || (TYPE_CODE (type) != TYPE_CODE_STRUCT && TYPE_CODE (type) != TYPE_CODE_UNION)) { - char *type_str; + const char *type_str; if (noerr) return NULL; @@ -7727,7 +7727,7 @@ ada_lookup_struct_elt_type (struct type *type, char *name, int refok, BadName: if (!noerr) { - char *name_str = name != NULL ? name : _(""); + const char *name_str = name != NULL ? name : _(""); error (_("Type %s has no component named %s"), type_as_string_and_cleanup (type), name_str); -- 2.7.4