gdb/ChangeLog |    5 +++++
 gdb/d-lang.c  |    6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gdb/d-lang.c b/gdb/d-lang.c
index 13b5438..3775e4b 100644
--- a/gdb/d-lang.c
+++ b/gdb/d-lang.c
@@ -244,7 +244,7 @@ static const struct language_defn d_language_defn =
   range_check_off,
   case_sensitive_on,
   array_row_major,
-  macro_expansion_c,
+  macro_expansion_no,
   &exp_descriptor_c,
   c_parse,
   c_error,
@@ -259,8 +259,8 @@ static const struct language_defn d_language_defn =
   c_value_print,		/* Print a top-level value.  */
   default_read_var_value,	/* la_read_var_value */
   NULL,				/* Language specific skip_trampoline.  */
-  "this",
-  basic_lookup_symbol_nonlocal, 
+  "this",			/* name_of_this */
+  basic_lookup_symbol_nonlocal,
   basic_lookup_transparent_type,
   d_demangle,			/* Language specific symbol demangler.  */
   NULL,				/* Language specific