forked from aniani/vim
patch 7.4.1165
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:
20
src/mbyte.c
20
src/mbyte.c
@@ -4392,9 +4392,9 @@ iconv_string(vcp, str, slen, unconvlenp, resultlenp)
|
||||
* Dynamically load the "iconv.dll" on Win32.
|
||||
*/
|
||||
|
||||
#ifndef DYNAMIC_ICONV /* just generating prototypes */
|
||||
# ifndef DYNAMIC_ICONV /* must be generating prototypes */
|
||||
# define HINSTANCE int
|
||||
#endif
|
||||
# endif
|
||||
static HINSTANCE hIconvDLL = 0;
|
||||
static HINSTANCE hMsvcrtDLL = 0;
|
||||
|
||||
@@ -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);
|
||||
|
@@ -500,9 +500,12 @@ dyn_libintl_init()
|
||||
if (hLibintlDLL)
|
||||
return 1;
|
||||
/* Load gettext library (libintl.dll) */
|
||||
hLibintlDLL = vimLoadLib(GETTEXT_DLL);
|
||||
#ifdef GETTEXT_DLL_ALT
|
||||
if (!hLibintlDLL)
|
||||
hLibintlDLL = vimLoadLib(GETTEXT_DLL_ALT);
|
||||
#endif
|
||||
if (!hLibintlDLL)
|
||||
hLibintlDLL = vimLoadLib(GETTEXT_DLL);
|
||||
if (!hLibintlDLL)
|
||||
{
|
||||
if (p_verbose > 0)
|
||||
|
@@ -741,6 +741,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1165,
|
||||
/**/
|
||||
1164,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user