diff options
| author | sebres <sebres@users.sourceforge.net> | 2017-03-06 20:19:39 (GMT) |
|---|---|---|
| committer | sebres <sebres@users.sourceforge.net> | 2017-03-06 20:19:39 (GMT) |
| commit | a307956de52eb22f4299959a93df2172b8a40b23 (patch) | |
| tree | e533d7a219281f35c1f76db707b49db9f39a6946 /generic/tclBasic.c | |
| parent | d5c91a755cafe40630668464ed4e070fdd647852 (diff) | |
| parent | ae0c48521551ffe6af28967e0c3b848836fb632e (diff) | |
| download | tcl-a307956de52eb22f4299959a93df2172b8a40b23.zip tcl-a307956de52eb22f4299959a93df2172b8a40b23.tar.gz tcl-a307956de52eb22f4299959a93df2172b8a40b23.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclBasic.c')
| -rw-r--r-- | generic/tclBasic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index f88c15d..cd7bd73 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -203,7 +203,7 @@ static const CmdInfo builtInCmds[] = { {"append", Tcl_AppendObjCmd, TclCompileAppendCmd, NULL, CMD_IS_SAFE}, {"apply", Tcl_ApplyObjCmd, NULL, TclNRApplyObjCmd, CMD_IS_SAFE}, {"break", Tcl_BreakObjCmd, TclCompileBreakCmd, NULL, CMD_IS_SAFE}, -#ifndef EXCLUDE_OBSOLETE_COMMANDS +#ifndef TCL_NO_DEPRECATED {"case", Tcl_CaseObjCmd, NULL, NULL, CMD_IS_SAFE}, #endif {"catch", Tcl_CatchObjCmd, TclCompileCatchCmd, TclNRCatchObjCmd, CMD_IS_SAFE}, @@ -4706,7 +4706,7 @@ TEOV_RunEnterTraces( { Interp *iPtr = (Interp *) interp; Command *cmdPtr = *cmdPtrPtr; - int newEpoch, cmdEpoch = cmdPtr->cmdEpoch; + size_t newEpoch, cmdEpoch = cmdPtr->cmdEpoch; int length, traceCode = TCL_OK; const char *command = TclGetStringFromObj(commandPtr, &length); @@ -6056,7 +6056,7 @@ TclNREvalObjEx( TclNRAddCallback(interp, TEOEx_ListCallback, listPtr, eoFramePtr, objPtr, NULL); - ListObjGetElements(listPtr, objc, objv); + TclListObjGetElements(NULL, listPtr, &objc, &objv); return TclNREvalObjv(interp, objc, objv, flags, NULL); } |