diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-03-27 13:07:29 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-03-27 13:07:29 (GMT) |
| commit | 0f64bee0cb0079b81d2b09ff9bee508416ea70c7 (patch) | |
| tree | 4286860ecfa77057377c770f894b76469765d7fb | |
| parent | 0ccf5b8ea3693952416bd5b5111667f7ecb5b135 (diff) | |
| download | tk-0f64bee0cb0079b81d2b09ff9bee508416ea70c7.zip tk-0f64bee0cb0079b81d2b09ff9bee508416ea70c7.tar.gz tk-0f64bee0cb0079b81d2b09ff9bee508416ea70c7.tar.bz2 | |
Make compiling/running Tk8.5 against 8.6 headers work on Windows as well.
In dynamic builds, Tcl_FindExecutable should always be taken from the stub table, even though the 8.6 headers tell otherwise. That's why in Tcl 8.6, the Tcl_FindExecutable() call moved from Tk_MainEx to the Tk_Main() macro.
FossilOrigin-Name: f7c61c80f5ec6067ed8d0084580437776c71b3fc
| -rw-r--r-- | generic/tkMain.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/generic/tkMain.c b/generic/tkMain.c index 5d58932..cb1fb5e 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -171,6 +171,12 @@ 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); |