From 9d6ca1cc5ebb6e61cc2ef73aecfbb0bdbb65432f Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 13 Oct 2015 13:49:09 +0200 Subject: patch 7.4.892 Problem: On MS-Windows the iconv DLL may have a different name. Solution: Also try libiconv2.dll and libiconv-2.dll. (Yasuhiro Matsumoto) --- src/mbyte.c | 15 ++++++++++++--- src/version.c | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/mbyte.c b/src/mbyte.c index 75559b014..6046d7d0b 100644 --- a/src/mbyte.c +++ b/src/mbyte.c @@ -4400,7 +4400,9 @@ static HINSTANCE hMsvcrtDLL = 0; # ifndef DYNAMIC_ICONV_DLL # define DYNAMIC_ICONV_DLL "iconv.dll" -# define DYNAMIC_ICONV_DLL_ALT "libiconv.dll" +# define DYNAMIC_ICONV_DLL_ALT1 "libiconv.dll" +# define DYNAMIC_ICONV_DLL_ALT2 "libiconv2.dll" +# define DYNAMIC_ICONV_DLL_ALT3 "libiconv-2.dll" # endif # ifndef DYNAMIC_MSVCRT_DLL # define DYNAMIC_MSVCRT_DLL "msvcrt.dll" @@ -4456,9 +4458,16 @@ iconv_enabled(verbose) { if (hIconvDLL != 0 && hMsvcrtDLL != 0) return TRUE; + + /* The iconv DLL file goes under different names, try them all. */ hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL); - if (hIconvDLL == 0) /* sometimes it's called libiconv.dll */ - hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT); + if (hIconvDLL == 0) + hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT1); + if (hIconvDLL == 0) + hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT2); + if (hIconvDLL == 0) + hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT3); + if (hIconvDLL != 0) hMsvcrtDLL = vimLoadLib(DYNAMIC_MSVCRT_DLL); if (hIconvDLL == 0 || hMsvcrtDLL == 0) diff --git a/src/version.c b/src/version.c index ce0579288..3722b5aee 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 892, /**/ 891, /**/ -- cgit v1.2.1