From: Pedro Alves <palves@redhat.com>
Date: Fri, 15 Apr 2016 16:08:53 +0000 (+0100)
Subject: Fix gdb build with --enable-build-with-cxx --disable-nls
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2b2798cc9716f45f752ea03411b6f9c9afc17cc6;p=binutils-gdb.git

Fix gdb build with --enable-build-with-cxx --disable-nls

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 : _("<null>");
					       ^
 Makefile:1140: recipe for target 'ada-lang.o' failed

gdb/ChangeLog:
2016-04-15  Pedro Alves  <palves@redhat.com>

	* ada-lang.c (ada_lookup_struct_elt_type): Constify 'type_str' and
	'name_str' locals.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f879b8ad346..c83cd02bcd1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-15  Pedro Alves  <palves@redhat.com>
+
+	* ada-lang.c (ada_lookup_struct_elt_type): Constify 'type_str' and
+	'name_str' locals.
+
 2016-04-15  Pedro Alves  <palves@redhat.com>
 
 	* btrace.c (pt_btrace_insn_flags): Change return type to
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 7cdb693852d..d01660a29f9 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 : _("<null>");
+      const char *name_str = name != NULL ? name : _("<null>");
 
       error (_("Type %s has no component named %s"),
 	     type_as_string_and_cleanup (type), name_str);