diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0b604fdfc30..d699070d614 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-14  Keith Seitz  <keiths@redhat.com>
+
+	* d-exp.y (PrimaryExpression : TypeExp '.' IdentifierExp): Rename
+	`typename' to `type_name' to avoid C++ reserved word.
+
 2015-08-14  Keith Seitz  <keiths@redhat.com>
 
 	* location.c (EL_TYPE, EL_LINESPEC, EL_PROBE, EL_ADDRESS)
diff --git a/gdb/d-exp.y b/gdb/d-exp.y
index e23a0aaeeae..e9d21ac50d2 100644
--- a/gdb/d-exp.y
+++ b/gdb/d-exp.y
@@ -522,12 +522,12 @@ PrimaryExpression:
 			    {
 			      struct bound_minimal_symbol msymbol;
 			      struct block_symbol sym;
-			      const char *typename = TYPE_SAFE_NAME (type);
-			      int typename_len = strlen (typename);
+			      const char *type_name = TYPE_SAFE_NAME (type);
+			      int type_name_len = strlen (type_name);
 			      char *name;
 
 			      name = xstrprintf ("%.*s.%.*s",
-						 typename_len, typename,
+						 type_name_len, type_name,
 						 $3.length, $3.ptr);
 			      make_cleanup (xfree, name);