commit 938ee834d345062cd94f8fdfd54fad0019432a83
author Bram Moolenaar <Bram@vim.org> Sun Jan 24 15:36:03 2016 +0100
committer Bram Moolenaar <Bram@vim.org> Sun Jan 24 15:36:03 2016 +0100
tree 7f5197eb27ce7d78484487fdd79ccaab6640352c
parent 6039c7f05376f0e470cf62bf2757e653aea357f3

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.

src/os_win32.c

diff --git a/src/os_win32.c b/src/os_win32.c
index da05e6e..4c876a0 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -500,9 +500,12 @@
     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)