diff options
author | Bram Moolenaar <Bram@vim.org> | 2013-10-02 14:25:44 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2013-10-02 14:25:44 +0200 |
commit | 0b4db6b6e58077c4bb5b1dc3fd30a04ce019e0f0 (patch) | |
tree | 83fd0bd4e1dea3a67eda2ddf837b3a19ab896ab4 | |
parent | ceb84af027ac782f0b9de0e66f321258358e391a (diff) | |
download | vim-git-0b4db6b6e58077c4bb5b1dc3fd30a04ce019e0f0.tar.gz |
updated for version 7.4.046v7.4.046
Problem: Can't use Tcl 8.6.
Solution: Change how Tcl_FindExecutable is called. (Jan Nijtmans)
-rw-r--r-- | src/if_tcl.c | 5 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/if_tcl.c b/src/if_tcl.c index be9cd64cb..b798ea59a 100644 --- a/src/if_tcl.c +++ b/src/if_tcl.c @@ -165,6 +165,7 @@ typedef int HANDLE; */ static HANDLE hTclLib = NULL; Tcl_Interp* (*dll_Tcl_CreateInterp)(); +void (*dll_Tcl_FindExecutable)(const void *); /* * Table of name to function pointer of tcl. @@ -175,6 +176,7 @@ static struct { TCL_PROC* ptr; } tcl_funcname_table[] = { {"Tcl_CreateInterp", (TCL_PROC*)&dll_Tcl_CreateInterp}, + {"Tcl_FindExecutable", (TCL_PROC*)&dll_Tcl_FindExecutable}, {NULL, NULL}, }; @@ -248,11 +250,12 @@ tcl_enabled(verbose) { Tcl_Interp *interp; + dll_Tcl_FindExecutable(find_executable_arg); + if (interp = dll_Tcl_CreateInterp()) { if (Tcl_InitStubs(interp, DYNAMIC_TCL_VER, 0)) { - Tcl_FindExecutable(find_executable_arg); Tcl_DeleteInterp(interp); stubs_initialized = TRUE; } diff --git a/src/version.c b/src/version.c index 63882ee78..c43ae93f0 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 46, +/**/ 45, /**/ 44, |