diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-01-28 10:52:51 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-01-28 10:52:51 (GMT) |
| commit | ed0a2a5b2bdcb0bacd90a00c5f95bc1c2d7b8b45 (patch) | |
| tree | eecbe9be07f4264988746f0e71da615830c1e314 /generic | |
| parent | 0e194b5bec8d3da46f61a2aeb5637fb7d82ad43b (diff) | |
| parent | 8f4c0692e4059e188dd75f711b271b138dce960d (diff) | |
| download | tk-ed0a2a5b2bdcb0bacd90a00c5f95bc1c2d7b8b45.zip tk-ed0a2a5b2bdcb0bacd90a00c5f95bc1c2d7b8b45.tar.gz tk-ed0a2a5b2bdcb0bacd90a00c5f95bc1c2d7b8b45.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkEntry.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkEntry.c b/generic/tkEntry.c index 9ae3a03..18069e9 100644 --- a/generic/tkEntry.c +++ b/generic/tkEntry.c @@ -3307,7 +3307,7 @@ EntryValidate( * string). */ { register Tcl_Interp *interp = entryPtr->interp; - int code, bool; + int code, isOK; code = Tcl_EvalEx(interp, cmd, -1, TCL_EVAL_GLOBAL | TCL_EVAL_DIRECT); @@ -3329,7 +3329,7 @@ EntryValidate( */ if (Tcl_GetBooleanFromObj(interp, Tcl_GetObjResult(interp), - &bool) != TCL_OK) { + &isOK) != TCL_OK) { Tcl_AddErrorInfo(interp, "\n (invalid boolean result from validation command)"); Tcl_BackgroundException(interp, TCL_ERROR); @@ -3338,7 +3338,7 @@ EntryValidate( } Tcl_ResetResult(interp); - return (bool ? TCL_OK : TCL_BREAK); + return (isOK ? TCL_OK : TCL_BREAK); } /* |