diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-02 16:49:39 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-02 16:49:39 (GMT) |
| commit | 042e4724c3c9392ca96e730fd83a10d39a228a35 (patch) | |
| tree | 7052a2b2b57fc7d01db3d9a3bd08e4aaa93686c2 /win | |
| parent | 7a979d7a9a53922375f02407d8ca44c602e8a033 (diff) | |
| parent | 5f7ce8feb0b989c40f609f9c05540a14a57159f4 (diff) | |
| download | tcl-042e4724c3c9392ca96e730fd83a10d39a228a35.zip tcl-042e4724c3c9392ca96e730fd83a10d39a228a35.tar.gz tcl-042e4724c3c9392ca96e730fd83a10d39a228a35.tar.bz2 | |
Merge 9.0
Diffstat (limited to 'win')
| -rw-r--r-- | win/tclAppInit.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/win/tclAppInit.c b/win/tclAppInit.c index cc0c652..605b771 100644 --- a/win/tclAppInit.c +++ b/win/tclAppInit.c @@ -91,18 +91,17 @@ MODULE_SCOPE int TCL_LOCAL_MAIN_HOOK(int *argc, TCHAR ***argv); int main( int argc, /* Number of command-line arguments. */ - char **argv1) + char **argv1) /* Not used. */ { TCHAR **argv; - TCHAR *p; #else int _tmain( int argc, /* Number of command-line arguments. */ TCHAR *argv[]) /* Values of command-line arguments. */ { - TCHAR *p; #endif + TCHAR *p; /* * Set up the default locale to be standard "C" locale so parsing is @@ -132,8 +131,8 @@ _tmain( #ifdef TCL_LOCAL_MAIN_HOOK TCL_LOCAL_MAIN_HOOK(&argc, &argv); -#elif !defined(_WIN32) || defined(UNICODE) - /* This doesn't work on Windows without UNICODE */ +#elif (TCL_MAJOR_VERSION > 8 || TCL_MINOR_VERSION > 6) && (!defined(_WIN32) || defined(UNICODE)) + /* New in Tcl 8.7. This doesn't work on Windows without UNICODE */ TclZipfs_AppHook(&argc, &argv); #endif |