thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.1165

Browse Source 
Problem:    When defining DYNAMIC_ICONV_DLL in the makefile, the build fails.
Solution:   Add #ifdef's. (Taro Muraoka)  Try the newer version first.
This commit is contained in:
Bram Moolenaar
2016-01-24 15:36:03 +01:00
parent 6039c7f053
commit 938ee834d3
3 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/mbyte.c
View File

@@ -4392,21 +4392,21 @@ iconv_string(vcp, str, slen, unconvlenp, resultlenp)
* Dynamically load the "iconv.dll" on Win32.
*/
#ifndef DYNAMIC_ICONV /* just generating prototypes */
# define HINSTANCE int
#endif
# ifndef DYNAMIC_ICONV /* must be generating prototypes */
# define HINSTANCE int
# endif
static HINSTANCE hIconvDLL = 0;
static HINSTANCE hMsvcrtDLL = 0;
# ifndef DYNAMIC_ICONV_DLL
# define DYNAMIC_ICONV_DLL "iconv.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"
# endif
# ifndef DYNAMIC_ICONV_DLL
# define DYNAMIC_ICONV_DLL "iconv.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"
# endif
/*
* Get the address of 'funcname' which is imported by 'hInst' DLL.
@@ -4459,14 +4459,22 @@ 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)
hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT1);
/* The iconv DLL file goes under different names, try them all.
* Do the "2" version first, it's newer. */
#ifdef DYNAMIC_ICONV_DLL_ALT2
if (hIconvDLL == 0)
hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT2);
#endif
#ifdef DYNAMIC_ICONV_DLL_ALT3
if (hIconvDLL == 0)
hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT3);
#endif
if (hIconvDLL == 0)
hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL);
#ifdef DYNAMIC_ICONV_DLL_ALT1
if (hIconvDLL == 0)
hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT1);
#endif
if (hIconvDLL != 0)
hMsvcrtDLL = vimLoadLib(DYNAMIC_MSVCRT_DLL);