Index: generic/gdbtk.h
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk.h,v
retrieving revision 1.12
diff -u -p -r1.12 gdbtk.h
--- generic/gdbtk.h	14 Jul 2008 23:43:36 -0000	1.12
+++ generic/gdbtk.h	2 Sep 2008 17:28:39 -0000
@@ -176,7 +176,7 @@ extern void
 #define GDBTK_SYMBOL_SOURCE_NAME(symbol) \
       (SYMBOL_DEMANGLED_NAME (symbol) != NULL \
        ? SYMBOL_DEMANGLED_NAME (symbol)       \
-       : DEPRECATED_SYMBOL_NAME (symbol))
+       : SYMBOL_PRINT_NAME (symbol))
 
 
 /* gdbtk_add_hooks - add all the hooks to gdb.  This will get called
Index: generic/gdbtk-cmds.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-cmds.c,v
retrieving revision 1.102
diff -u -p -r1.102 gdbtk-cmds.c
--- generic/gdbtk-cmds.c	2 Aug 2008 22:08:32 -0000	1.102
+++ generic/gdbtk-cmds.c	2 Sep 2008 17:28:40 -0000
@@ -1495,7 +1495,7 @@ gdb_listfuncs (clientData, interp, objc,
 		}
 	      else
 		{
-		  funcVals[0] = Tcl_NewStringObj (DEPRECATED_SYMBOL_NAME (sym), -1);
+		  funcVals[0] = Tcl_NewStringObj (SYMBOL_PRINT_NAME (sym), -1);
 		  funcVals[1] = not_mangled;
 		}
 	      Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
Index: generic/gdbtk-stack.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-stack.c,v
retrieving revision 1.28
diff -u -p -r1.28 gdbtk-stack.c
--- generic/gdbtk-stack.c	14 Jul 2008 23:43:36 -0000	1.28
+++ generic/gdbtk-stack.c	2 Sep 2008 17:28:40 -0000
@@ -122,7 +122,7 @@ gdb_block_vars (ClientData clientData, T
 		case LOC_REGISTER:        /* register              */
 		case LOC_COMPUTED:	  /* computed location     */
 		  Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr,
-					    Tcl_NewStringObj (DEPRECATED_SYMBOL_NAME (sym),
+					    Tcl_NewStringObj (SYMBOL_PRINT_NAME (sym),
 							      -1));
 		  break;
 
@@ -337,7 +337,7 @@ gdb_get_vars_command (ClientData clientD
 	    case LOC_REGPARM_ADDR:	/* indirect register arg */
 	      if (arguments)
 		Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr,
-					  Tcl_NewStringObj (DEPRECATED_SYMBOL_NAME (sym), -1));
+					  Tcl_NewStringObj (SYMBOL_PRINT_NAME (sym), -1));
 	      break;
 	    case LOC_LOCAL:	/* stack local           */
 	    case LOC_STATIC:	/* static                */
@@ -345,7 +345,7 @@ gdb_get_vars_command (ClientData clientD
 	    case LOC_COMPUTED:	/* computed location     */
 	      if (!arguments)
 		Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr,
-					  Tcl_NewStringObj (DEPRECATED_SYMBOL_NAME (sym), -1));
+					  Tcl_NewStringObj (SYMBOL_PRINT_NAME (sym), -1));
 	      break;
 	    }
 	}