summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-08-02 20:05:32 +0200
committerBram Moolenaar <Bram@vim.org>2013-08-02 20:05:32 +0200
commit364ab2ffd3ecc88f9547c28d51c138d53fead488 (patch)
treec0c14e73941121f4842458d88a6f290cbad7adc1
parentbc88a275375c65538c2eaadb55d4ddc26346f695 (diff)
downloadvim-git-364ab2ffd3ecc88f9547c28d51c138d53fead488.tar.gz
updated for version 7.4b.010v7.4b.010
Problem: Win32: Tcl library load does not use standard mechanism. Solution: Call vimLoadLib() instead of LoadLibraryEx(). (Ken Takata)
-rw-r--r--src/if_perl.xs2
-rw-r--r--src/if_tcl.c2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/if_perl.xs b/src/if_perl.xs
index 4c46f2abb..a2247f022 100644
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -495,7 +495,7 @@ static struct {
/*
* Make all runtime-links of perl.
*
- * 1. Get module handle using LoadLibraryEx.
+ * 1. Get module handle using dlopen() or vimLoadLib().
* 2. Get pointer to perl function by GetProcAddress.
* 3. Repeat 2, until get all functions will be used.
*
diff --git a/src/if_tcl.c b/src/if_tcl.c
index 36ff32063..be9cd64cb 100644
--- a/src/if_tcl.c
+++ b/src/if_tcl.c
@@ -195,7 +195,7 @@ tcl_runtime_link_init(char *libname, int verbose)
if (hTclLib)
return OK;
- if (!(hTclLib = LoadLibraryEx(libname, NULL, 0)))
+ if (!(hTclLib = vimLoadLib(libname)))
{
if (verbose)
EMSG2(_(e_loadlib), libname);
diff --git a/src/version.c b/src/version.c
index 9b5343e9d..61694a467 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 10,
+/**/
9,
/**/
8,