summaryrefslogtreecommitdiffstats
path: root/generic/tclExecute.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2007-11-13 13:07:41 (GMT)
committerdgp <dgp@users.sourceforge.net>2007-11-13 13:07:41 (GMT)
commit55e6c0333341b101e68407be7eebe42f829c9f33 (patch)
tree3b69b58b8886345d39a4baaa84342e6860001df3 /generic/tclExecute.c
parent19ff89ec05fbfdb2e383a89c9f522e5474f484fd (diff)
downloadtcl-55e6c0333341b101e68407be7eebe42f829c9f33.zip
tcl-55e6c0333341b101e68407be7eebe42f829c9f33.tar.gz
tcl-55e6c0333341b101e68407be7eebe42f829c9f33.tar.bz2
merge updates from HEAD
Diffstat (limited to 'generic/tclExecute.c')
-rw-r--r--generic/tclExecute.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 3efd610..bb83839 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclExecute.c,v 1.285.2.22 2007/11/12 19:18:16 dgp Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.285.2.23 2007/11/13 13:07:41 dgp Exp $
*/
#include "tclInt.h"
@@ -1218,7 +1218,7 @@ Tcl_ExprObj(
saveObjPtr = Tcl_GetObjResult(interp);
Tcl_IncrRefCount(saveObjPtr);
- TclResetResult(interp);
+ Tcl_ResetResult(interp);
/*
* Increment the code's ref count while it is being executed. If
@@ -6336,7 +6336,7 @@ TclExecuteByteCode(
case INST_END_CATCH:
catchTop--;
- TclResetResult(interp);
+ Tcl_ResetResult(interp);
result = TCL_OK;
TRACE(("=> catchTop=%d\n", (catchTop - initCatchTop - 1)));
NEXT_INST_F(1, 0, 0);