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

5
src/os_win32.c
View File

@@ -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)