On Monday, October 12, 2015 at 10:52:27 AM UTC+9, K.Takata wrote:
> @mattn No, it will be changed when libiconv changes its API and if
> compatibility is lost. Not when libtool is changed.
>
>
> —
> Reply to this email directly or view it on GitHub.
Bram, below is a patch.
diff --git a/src/mbyte.c b/src/mbyte.c
index 75559b0..7351b67 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -4400,7 +4400,8 @@ 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 "libiconv-2.dll"
# endif
# ifndef DYNAMIC_MSVCRT_DLL
# define DYNAMIC_MSVCRT_DLL "msvcrt.dll"
@@ -4458,7 +4459,9 @@ iconv_enabled(verbose)
return TRUE;
hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL);
if (hIconvDLL == 0) /* sometimes it's called libiconv.dll */
- hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT);
+ hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT1);
+ if (hIconvDLL == 0) /* sometimes it's called libiconv-2.dll
*/
+ hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT2);
if (hIconvDLL != 0)
hMsvcrtDLL = vimLoadLib(DYNAMIC_MSVCRT_DLL);
if (hIconvDLL == 0 || hMsvcrtDLL == 0)
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
