--- gdb/gdbtk/generic/gdbtk.c.ORIG 2013-01-29 11:14:02.921774310 +0100 +++ gdb/gdbtk/generic/gdbtk.c 2013-01-29 11:35:27.000656838 +0100 @@ -493,17 +493,17 @@ make_final_cleanup (gdbtk_cleanup, NULL); if (Tcl_Init (gdbtk_interp) != TCL_OK) - error ("Tcl_Init failed: %s", gdbtk_interp->result); + error ("Tcl_Init failed: %s", Tcl_GetStringResult(gdbtk_interp)); /* Initialize the Paths variable. */ if (ide_initialize_paths (gdbtk_interp, "") != TCL_OK) - error ("ide_initialize_paths failed: %s", gdbtk_interp->result); + error ("ide_initialize_paths failed: %s", Tcl_GetStringResult(gdbtk_interp)); if (Tk_Init (gdbtk_interp) != TCL_OK) - error ("Tk_Init failed: %s", gdbtk_interp->result); + error ("Tk_Init failed: %s", Tcl_GetStringResult(gdbtk_interp)); if (Tktable_Init (gdbtk_interp) != TCL_OK) - error ("Tktable_Init failed: %s", gdbtk_interp->result); + error ("Tktable_Init failed: %s", Tcl_GetStringResult(gdbtk_interp)); Tcl_StaticPackage (gdbtk_interp, "Tktable", Tktable_Init, (Tcl_PackageInitProc *) NULL); @@ -559,7 +559,7 @@ if (Gdbtk_Init (gdbtk_interp) != TCL_OK) { - error ("Gdbtk_Init failed: %s", gdbtk_interp->result); + error ("Gdbtk_Init failed: %s", Tcl_GetStringResult(gdbtk_interp)); } Tcl_StaticPackage (gdbtk_interp, "Insight", Gdbtk_Init, NULL); @@ -739,7 +739,7 @@ retval = Tcl_Eval (gdbtk_interp, cmd); - result = xstrdup (gdbtk_interp->result); + result = xstrdup (Tcl_GetStringResult(gdbtk_interp)); old_chain = make_cleanup (free, result); --- gdb/gdbtk/generic/gdbtk-hooks.c.ORIG 2013-01-29 11:39:03.047637073 +0100 +++ gdb/gdbtk/generic/gdbtk-hooks.c 2013-01-29 11:44:18.065608254 +0100 @@ -255,13 +255,13 @@ actual_len = 0; } else - actual_len = strlen (gdbtk_interp->result); + actual_len = strlen (Tcl_GetStringResult(gdbtk_interp)); /* Truncate the string if it is too big for the caller's buffer. */ if (actual_len >= sizeof_buf) actual_len = sizeof_buf - 1; - memcpy (buf, gdbtk_interp->result, actual_len); + memcpy (buf, Tcl_GetStringResult(gdbtk_interp), actual_len); buf[actual_len] = '\0'; return actual_len; } @@ -506,11 +506,11 @@ if (result == TCL_OK) { - return (xstrdup (gdbtk_interp->result)); + return (xstrdup (Tcl_GetStringResult(gdbtk_interp))); } else { - gdbtk_fputs (gdbtk_interp->result, gdb_stdout); + gdbtk_fputs (Tcl_GetStringResult(gdbtk_interp), gdb_stdout); gdbtk_fputs ("\n", gdb_stdout); return (NULL); } @@ -634,7 +634,7 @@ report_error (); free(buf); - return atoi (gdbtk_interp->result); + return atoi (Tcl_GetStringResult(gdbtk_interp)); } @@ -687,7 +687,7 @@ gdbtk_two_elem_cmd ("gdbtk_tcl_query", buf); free(buf); - val = atol (gdbtk_interp->result); + val = atol (Tcl_GetStringResult(gdbtk_interp)); return val; } --- gdb/gdbtk/plugins/rhabout/rhabout.c.ORIG 2004-12-08 21:21:08.000000000 +0100 +++ gdb/gdbtk/plugins/rhabout/rhabout.c 2013-01-29 11:51:31.909568565 +0100 @@ -22,7 +22,7 @@ Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { - interp->result = "\nThis is a sample plug-in\n"; + Tcl_SetResult(interp,"\nThis is a sample plug-in\n", TCL_VOLATILE); return TCL_OK; }