diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-04-03 13:24:39 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-04-03 13:24:39 (GMT) |
| commit | 6c3188baaf39b816f6804c3d57cb70368384cab0 (patch) | |
| tree | 0216a9e014a1edd19fff7c344e2256d3528f10c0 /generic/tkMain.c | |
| parent | f2d23fc648c74066e46c078fb8d4e795d9fcaf41 (diff) | |
| download | tk-6c3188baaf39b816f6804c3d57cb70368384cab0.zip tk-6c3188baaf39b816f6804c3d57cb70368384cab0.tar.gz tk-6c3188baaf39b816f6804c3d57cb70368384cab0.tar.bz2 | |
merge release to 8.5; revert features not included in release
Diffstat (limited to 'generic/tkMain.c')
| -rw-r--r-- | generic/tkMain.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/generic/tkMain.c b/generic/tkMain.c index 8bebb3d..5d58932 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -135,7 +135,7 @@ Tk_MainEx( * Ensure that we are getting a compatible version of Tcl. */ - if (Tcl_InitStubs(interp, TCL_VERSION ".0", 0) == NULL) { + if (Tcl_InitStubs(interp, "8.5.0", 0) == NULL) { if (Tcl_InitStubs(interp, "8.1", 0) == NULL) { abort(); } else { @@ -171,12 +171,6 @@ Tk_MainEx( tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); -#if !defined(STATIC_BUILD) -# undef Tcl_FindExecutable -# define Tcl_FindExecutable \ - (tclStubsPtr->tcl_FindExecutable) /* 144 */ -#endif - Tcl_FindExecutable(argv[0]); tsdPtr->interp = interp; Tcl_Preserve((ClientData) interp); |