diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-16 08:16:45 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-16 08:16:45 (GMT) |
| commit | 9b2958c5803abffb4174f28adac63058409ded8e (patch) | |
| tree | 4029abe2d063c04a3e8a028fadf1026dc2fafa1d /generic/tkMain.c | |
| parent | 85721c6804689f38b266333d42fba5865907961a (diff) | |
| parent | 487b808fa7ad1096e9ee4112a719c8ed3cd45ff8 (diff) | |
| download | tk-9b2958c5803abffb4174f28adac63058409ded8e.zip tk-9b2958c5803abffb4174f28adac63058409ded8e.tar.gz tk-9b2958c5803abffb4174f28adac63058409ded8e.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tkMain.c')
| -rw-r--r-- | generic/tkMain.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkMain.c b/generic/tkMain.c index 3a9b4a1..bce6dbb 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -266,7 +266,7 @@ Tk_MainEx( if ((argc > 3) && (0 == _tcscmp(TEXT("-encoding"), argv[1])) && (TEXT('-') != argv[3][0])) { - Tcl_Obj *value = NewNativeObj(argv[2]); + Tcl_Obj *value = NewNativeObj(argv[2]); Tcl_SetStartupScript(NewNativeObj(argv[3]), Tcl_GetString(value)); Tcl_DecrRefCount(value); argc -= 3; @@ -427,7 +427,7 @@ StdinProc( Tcl_Channel chan = isPtr->input; Tcl_Interp *interp = isPtr->interp; - count = Tcl_Gets(chan, &isPtr->line); + count = (size_t)Tcl_Gets(chan, &isPtr->line); if (count == (size_t)-1 && !isPtr->gotPartial) { if (isPtr->tty) { |