From bfeeb14b8468ab3f60d719f2cde697d1b537eba8 Mon Sep 17 00:00:00 2001
From: Doug Evans <dje@google.com>
Date: Wed, 16 Mar 2016 10:30:41 -0700
Subject: [PATCH] xml-tdesc.c (tdesc_start_enum): Fix c++ build.

gdb/ChangeLog:

	* xml-tdesc.c (tdesc_start_enum): Fix c++ build.
---
 gdb/ChangeLog   | 4 ++++
 gdb/xml-tdesc.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 83457dc2faa..a9952cb765b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2016-03-16  Doug Evans  <dje@google.com>
+
+	* xml-tdesc.c (tdesc_start_enum): Fix c++ build.
+
 2016-03-16  Yao Qi  <yao.qi@linaro.org>
 
 	* arm-linux-tdep.c (arm_linux_init_abi): Fix
diff --git a/gdb/xml-tdesc.c b/gdb/xml-tdesc.c
index a0fd08acf86..aa58385df9f 100644
--- a/gdb/xml-tdesc.c
+++ b/gdb/xml-tdesc.c
@@ -300,8 +300,8 @@ tdesc_start_enum (struct gdb_xml_parser *parser,
 		  const struct gdb_xml_element *element,
 		  void *user_data, VEC(gdb_xml_value_s) *attributes)
 {
-  struct tdesc_parsing_data *data = user_data;
-  char *id = xml_find_attribute (attributes, "id")->value;
+  struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data;
+  char *id = (char *) xml_find_attribute (attributes, "id")->value;
   int size = * (ULONGEST *)
     xml_find_attribute (attributes, "size")->value;
   struct tdesc_type *type;