Index: cp-valprint.c
===================================================================
RCS file: /cvs/src/src/gdb/cp-valprint.c,v
retrieving revision 1.27
diff -c -3 -p -r1.27 cp-valprint.c
*** cp-valprint.c	12 Nov 2004 21:45:06 -0000	1.27
--- cp-valprint.c	5 Dec 2004 18:23:27 -0000
***************
*** 35,41 ****
  #include "target.h"
  #include "cp-abi.h"
  #include "valprint.h"
! 
  int vtblprint;			/* Controls printing of vtbl's */
  int objectprint;		/* Controls looking up an object's derived type
  				   using what we find in its vtables.  */
--- 35,41 ----
  #include "target.h"
  #include "cp-abi.h"
  #include "valprint.h"
! #include "language.h"
  int vtblprint;			/* Controls printing of vtbl's */
  int objectprint;		/* Controls looking up an object's derived type
  				   using what we find in its vtables.  */
*************** cp_print_value_fields (struct type *type
*** 317,327 ****
  	      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);
  	    }
--- 317,327 ----
  	      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
*** 332,338 ****
  	      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 */
--- 332,338 ----
  	      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 */