--- /dev/null	2004-06-30 21:59:41.000000000 +0530
+++ testsuite/gdb.base/gdb1821.c	2005-02-10 13:50:52.000000000 +0530
@@ -0,0 +1,25 @@
+/* Test printing of structure member names in gdb. PR exp/1821
+
+   Copyright 2005, Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+struct foo { double x__0, y__0, z__1; } bar;
+
+
+int main(void) { return 0; }
--- /dev/null	2004-06-30 21:59:41.000000000 +0530
+++ testsuite/gdb.base/gdb1821.c	2005-02-10 13:50:52.000000000 +0530
@@ -0,0 +1,25 @@
+/* Test printing of structure member names in gdb. PR exp/1821
+
+   Copyright 2005, Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+struct foo { double x__0, y__0, z__1; } bar;
+
+
+int main(void) { return 0; }
Index: cp-valprint.c
===================================================================
RCS file: /cvs/src/src/gdb/cp-valprint.c,v
retrieving revision 1.36
diff -c -3 -p -r1.36 cp-valprint.c
*** cp-valprint.c	9 Feb 2005 00:04:28 -0000	1.36
--- cp-valprint.c	10 Feb 2005 09:47:33 -0000
***************
*** 36,41 ****
--- 36,42 ----
  #include "cp-abi.h"
  #include "valprint.h"
  #include "cp-support.h"
+ #include "language.h"
  
  int vtblprint;			/* Controls printing of vtbl's */
  int objectprint;		/* Controls looking up an object's derived type
*************** cp_print_value_fields (struct type *type
*** 319,329 ****
  	      if (TYPE_FIELD_STATIC (type, i))
  		fputs_filtered ("static ", stream);
  	      fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
! 				       language_cplus,
  				       DMGL_PARAMS | DMGL_ANSI);
  	      fputs_filtered ("\" \"", stream);
  	      fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
! 				       language_cplus,
  				       DMGL_PARAMS | DMGL_ANSI);
  	      fputs_filtered ("\") \"", stream);
  	    }
--- 320,330 ----
  	      if (TYPE_FIELD_STATIC (type, i))
  		fputs_filtered ("static ", stream);
  	      fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
! 				       current_language->la_language,
  				       DMGL_PARAMS | DMGL_ANSI);
  	      fputs_filtered ("\" \"", stream);
  	      fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
! 				       current_language->la_language,
  				       DMGL_PARAMS | DMGL_ANSI);
  	      fputs_filtered ("\") \"", stream);
  	    }
*************** cp_print_value_fields (struct type *type
*** 334,340 ****
  	      if (TYPE_FIELD_STATIC (type, i))
  		fputs_filtered ("static ", stream);
  	      fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
! 				       language_cplus,
  				       DMGL_PARAMS | DMGL_ANSI);
  	      annotate_field_name_end ();
  	      /* do not print leading '=' in case of anonymous unions */
--- 335,341 ----
  	      if (TYPE_FIELD_STATIC (type, i))
  		fputs_filtered ("static ", stream);
  	      fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
! 				       current_language->la_language,
  				       DMGL_PARAMS | DMGL_ANSI);
  	      annotate_field_name_end ();
  	      /* do not print leading '=' in case of anonymous unions */
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.697
diff -c -3 -p -r1.697 Makefile.in
*** Makefile.in	9 Feb 2005 00:04:27 -0000	1.697
--- Makefile.in	10 Feb 2005 09:47:58 -0000
*************** cpu32bug-rom.o: cpu32bug-rom.c $(defs_h)
*** 1823,1829 ****
  cp-valprint.o: cp-valprint.c $(defs_h) $(gdb_obstack_h) $(symtab_h) \
  	$(gdbtypes_h) $(expression_h) $(value_h) $(command_h) $(gdbcmd_h) \
  	$(demangle_h) $(annotate_h) $(gdb_string_h) $(c_lang_h) $(target_h) \
! 	$(cp_abi_h) $(valprint_h) $(cp_support_h)
  cris-tdep.o: cris-tdep.c $(defs_h) $(frame_h) $(frame_unwind_h) \
  	$(frame_base_h) $(trad_frame_h) $(dwarf2_frame_h) $(symtab_h) \
  	$(inferior_h) $(gdbtypes_h) $(gdbcore_h) $(gdbcmd_h) $(target_h) \
--- 1823,1829 ----
  cp-valprint.o: cp-valprint.c $(defs_h) $(gdb_obstack_h) $(symtab_h) \
  	$(gdbtypes_h) $(expression_h) $(value_h) $(command_h) $(gdbcmd_h) \
  	$(demangle_h) $(annotate_h) $(gdb_string_h) $(c_lang_h) $(target_h) \
! 	$(cp_abi_h) $(valprint_h) $(cp_support_h) $(language_h)
  cris-tdep.o: cris-tdep.c $(defs_h) $(frame_h) $(frame_unwind_h) \
  	$(frame_base_h) $(trad_frame_h) $(dwarf2_frame_h) $(symtab_h) \
  	$(inferior_h) $(gdbtypes_h) $(gdbcore_h) $(gdbcmd_h) $(target_h) \