diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-04 13:32:33 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-04 13:32:33 (GMT) |
| commit | ed03f6443d23a28f548fdb7133e79bb54ddb9be6 (patch) | |
| tree | 95ade5f3ce96de5c4534b70989a78ddee0fdf6c5 /generic/tclMain.c | |
| parent | 925a24a48c5e871795429181c391c43fcd1f17c1 (diff) | |
| parent | 3d226005a36109789b57bc116a54331b29a2871c (diff) | |
| download | tcl-ed03f6443d23a28f548fdb7133e79bb54ddb9be6.zip tcl-ed03f6443d23a28f548fdb7133e79bb54ddb9be6.tar.gz tcl-ed03f6443d23a28f548fdb7133e79bb54ddb9be6.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tclMain.c')
| -rw-r--r-- | generic/tclMain.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclMain.c b/generic/tclMain.c index 8b7331f..d23cd7b 100644 --- a/generic/tclMain.c +++ b/generic/tclMain.c @@ -286,7 +286,7 @@ Tcl_MainEx( { int i=0; /* argv[i] index */ Tcl_Obj *path, *resultPtr, *argvPtr, *appName; - const char *encoding = NULL; + const char *encodingName = NULL; int code, exitCode = 0; Tcl_MainLoopProc *mainLoopProc; Tcl_Channel chan; @@ -336,7 +336,7 @@ Tcl_MainEx( } } - path = Tcl_GetStartupScript(&encoding); + path = Tcl_GetStartupScript(&encodingName); if (path != NULL) { appName = path; } else if (argv[0]) { @@ -398,10 +398,10 @@ Tcl_MainEx( * again, as the appInitProc might have reset it. */ - path = Tcl_GetStartupScript(&encoding); + path = Tcl_GetStartupScript(&encodingName); if (path != NULL) { Tcl_ResetResult(interp); - code = Tcl_FSEvalFileEx(interp, path, encoding); + code = Tcl_FSEvalFileEx(interp, path, encodingName); if (code != TCL_OK) { chan = Tcl_GetStdChannel(TCL_STDERR); if (chan) { |