Mercurial > vim

diff src/mbyte.c @ 2612:fa5dee44df3f v7.3.034

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.034 Problem: Win32: may be loading .dll from the wrong directory. Solution: Go to the Vim executable directory when opening a library.
author Bram Moolenaar <bram@vim.org>
date Sat, 23 Oct 2010 14:02:54 +0200
parents 06aa43dde561
children fb60c9f35517
line wrap: on
line diff
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -4159,11 +4159,11 @@ iconv_enabled(verbose)
 {
     if (hIconvDLL != 0 && hMsvcrtDLL != 0)
 	return TRUE;
-    hIconvDLL = LoadLibrary(DYNAMIC_ICONV_DLL);
+    hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL);
     if (hIconvDLL == 0)		/* sometimes it's called libiconv.dll */
-	hIconvDLL = LoadLibrary(DYNAMIC_ICONV_DLL_ALT);
+	hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT);
     if (hIconvDLL != 0)
-	hMsvcrtDLL = LoadLibrary(DYNAMIC_MSVCRT_DLL);
+	hMsvcrtDLL = vimLoadLib(DYNAMIC_MSVCRT_DLL);
     if (hIconvDLL == 0 || hMsvcrtDLL == 0)
     {
 	/* Only give the message when 'verbose' is set, otherwise it might be