diff options
| author | dgp <dgp@users.sourceforge.net> | 2018-04-17 14:38:28 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2018-04-17 14:38:28 (GMT) |
| commit | 05845fbe5f778520cb2a60420a657d9b21de83b7 (patch) | |
| tree | 87a76936a903076e0d792dc94f3097aef56f2047 /generic | |
| parent | ff7812fe978a8661671807d3910d7b99e16ea8c2 (diff) | |
| parent | 80e5aed49e2cac237b9d91db0f5dc1139c6462dd (diff) | |
| download | tcl-05845fbe5f778520cb2a60420a657d9b21de83b7.zip tcl-05845fbe5f778520cb2a60420a657d9b21de83b7.tar.gz tcl-05845fbe5f778520cb2a60420a657d9b21de83b7.tar.bz2 | |
merge 8.5
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclTrace.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/generic/tclTrace.c b/generic/tclTrace.c index 4e74c54..958399a 100644 --- a/generic/tclTrace.c +++ b/generic/tclTrace.c @@ -191,8 +191,10 @@ Tcl_TraceObjCmd( Tcl_Obj *const objv[]) /* Argument objects. */ { int optionIndex; +#ifndef TCL_REMOVE_OBSOLETE_TRACES const char *name; const char *flagOps, *p; +#endif /* Main sub commands to 'trace' */ static const char *const traceOptions[] = { "add", "info", "remove", @@ -365,12 +367,14 @@ Tcl_TraceObjCmd( } return TCL_OK; +#ifndef TCL_REMOVE_OBSOLETE_TRACES badVarOps: Tcl_SetObjResult(interp, Tcl_ObjPrintf( "bad operations \"%s\": should be one or more of rwua", flagOps)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRACE", "BADOPS", NULL); return TCL_ERROR; +#endif } /* @@ -912,9 +916,11 @@ TraceVariableObjCmd( + 1 + length); ctvarPtr->traceCmdInfo.flags = flags; +#ifndef TCL_REMOVE_OBSOLETE_TRACES if (objv[0] == NULL) { ctvarPtr->traceCmdInfo.flags |= TCL_TRACE_OLD_STYLE; } +#endif ctvarPtr->traceCmdInfo.length = length; flags |= TCL_TRACE_UNSETS | TCL_TRACE_RESULT_OBJECT; memcpy(ctvarPtr->traceCmdInfo.command, command, length+1); @@ -939,7 +945,11 @@ TraceVariableObjCmd( TraceVarInfo *tvarPtr = clientData; if ((tvarPtr->length == length) - && ((tvarPtr->flags & ~TCL_TRACE_OLD_STYLE)==flags) + && ((tvarPtr->flags +#ifndef TCL_REMOVE_OBSOLETE_TRACES +& ~TCL_TRACE_OLD_STYLE +#endif + )==flags) && (strncmp(command, tvarPtr->command, (size_t) length) == 0)) { Tcl_UntraceVar2(interp, name, NULL, |