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

20
src/mbyte.c
View File

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

5
src/os_win32.c
View File

@@ -500,9 +500,12 @@ dyn_libintl_init()
if (hLibintlDLL) if (hLibintlDLL)
return 1; return 1;
/* Load gettext library (libintl.dll) */ /* Load gettext library (libintl.dll) */
hLibintlDLL = vimLoadLib(GETTEXT_DLL); #ifdef GETTEXT_DLL_ALT
if (!hLibintlDLL) if (!hLibintlDLL)
hLibintlDLL = vimLoadLib(GETTEXT_DLL_ALT); hLibintlDLL = vimLoadLib(GETTEXT_DLL_ALT);
#endif
if (!hLibintlDLL)
hLibintlDLL = vimLoadLib(GETTEXT_DLL);
if (!hLibintlDLL) if (!hLibintlDLL)
{ {
if (p_verbose > 0) if (p_verbose > 0)

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1165,
/**/ /**/
1164, 1164,
/**/ /**/