From 17c1d04baa9a77ee3785645eb8bed03e38a0035a Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Wed, 9 Feb 2022 13:50:00 +0000 Subject: Eliminate 'shadowed variable' warning for win32. Eliminate '-file' argument for wish when built with Tcl 9. --- generic/tkMain.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/generic/tkMain.c b/generic/tkMain.c index 67617f4..e1234f9 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -206,10 +206,10 @@ Tk_MainEx( return; } } else { - int i; + int j; - for (i = 1; i < argc; ++i) { - if (!_tcscmp(argv[i], TEXT("-display"))) { + for (j = 1; j < argc; ++j) { + if (!strcmp(argv[j], "-display")) { goto loadCygwinTk; } } @@ -252,7 +252,7 @@ Tk_MainEx( * or like * FILENAME * or like - * -file FILENAME (ancient history support only) + * -file FILENAME (ancient history support only, removed with Tcl 9.0) */ /* mind argc is being adjusted as we proceed */ @@ -268,6 +268,7 @@ Tk_MainEx( Tcl_SetStartupScript(NewNativeObj(argv[1]), NULL); argc--; i++; +#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9 } else if ((argc >= 2) && (length = _tcslen(argv[1])) && (length > 1) && (0 == _tcsncmp(TEXT("-file"), argv[1], length)) && ('-' != argv[2][0])) { @@ -275,6 +276,7 @@ Tk_MainEx( argc -= 2; i += 2; } +#endif } path = Tcl_GetStartupScript(&encodingName); -- cgit v0.12