$svn diff Index: gdbtk-stack.c =================================================================== --- gdbtk-stack.c (revision 117583) +++ gdbtk-stack.c (working copy) @@ -92,7 +92,7 @@ int objc, Tcl_Obj *CONST objv[]) { struct block *block; - struct dict_iterator iter; + struct block_iterator iter; struct symbol *sym; CORE_ADDR start, end; @@ -162,7 +162,7 @@ int objc, Tcl_Obj *CONST objv[]) { struct block *block; - struct dict_iterator iter; + struct block_iterator iter; int junk; struct symbol *sym; CORE_ADDR pc; @@ -282,7 +282,7 @@ struct symbol *sym; struct block *block; char *args; - struct dict_iterator iter; + struct block_iterator iter; int i, arguments; if (objc > 2) Index: gdbtk-hooks.c =================================================================== --- gdbtk-hooks.c (revision 117583) +++ gdbtk-hooks.c (working copy) @@ -818,8 +818,8 @@ tp = inferior_thread (); buf = xstrprintf ("gdbtk_signal %s {%s}", - target_signal_to_name (tp->suspend.stop_signal), - target_signal_to_string (tp->suspend.stop_signal)); + gdb_signal_to_name (tp->suspend.stop_signal), + gdb_signal_to_string (tp->suspend.stop_signal)); if (Tcl_Eval (gdbtk_interp, buf) != TCL_OK) report_error (); free(buf); Index: gdbtk-cmds.c =================================================================== --- gdbtk-cmds.c (revision 117583) +++ gdbtk-cmds.c (working copy) @@ -1537,7 +1537,7 @@ struct block *b; struct symbol *sym; int i; - struct dict_iterator iter; + struct block_iterator iter; Tcl_Obj *funcVals[2]; if (objc != 2) Index: gdbtk-bp.c =================================================================== --- gdbtk-bp.c (revision 117583) +++ gdbtk-bp.c (working copy) @@ -535,6 +535,7 @@ TRY_CATCH (e, RETURN_MASK_ALL) { create_breakpoint (get_current_arch (), address, condition, thread, + NULL, 0 /* condition and thread are valid */, temp, bp_breakpoint /* type wanted */,