From 364ab2ffd3ecc88f9547c28d51c138d53fead488 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 2 Aug 2013 20:05:32 +0200 Subject: [PATCH] updated for version 7.4b.010 Problem: Win32: Tcl library load does not use standard mechanism. Solution: Call vimLoadLib() instead of LoadLibraryEx(). (Ken Takata) --- src/if_perl.xs | 2 +- src/if_tcl.c | 2 +- src/version.c | 2 ++ 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 @@ -727,6 +727,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 10, /**/ 9, /**/ -- 2.50.1