commit 7554c548a493cba50b2d0ea3521cac14f28a1f07
author Bram Moolenaar <Bram@vim.org> Sat Oct 06 15:03:15 2018 +0200
committer Bram Moolenaar <Bram@vim.org> Sat Oct 06 15:03:15 2018 +0200
tree 3bf0bd92e3572fda2ea0261bd4e0bf92a4425706
parent 2bc152ab53c4b01072edf6ec2ff61e504cb03cbe

patch 8.1.0452: MS-Windows: not finding intl.dll

Problem:    MS-Windows: not finding intl.dll.
Solution:   Also find intl.dll next to libintl.dll. (Ken Takata)

src/os_win32.c

diff --git a/src/os_win32.c b/src/os_win32.c
index a53b7b6..4ba060b 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -573,7 +573,8 @@
 #if defined(DYNAMIC_GETTEXT) || defined(PROTO)
 # ifndef GETTEXT_DLL
 #  define GETTEXT_DLL "libintl.dll"
-#  define GETTEXT_DLL_ALT "libintl-8.dll"
+#  define GETTEXT_DLL_ALT1 "libintl-8.dll"
+#  define GETTEXT_DLL_ALT2 "intl.dll"
 # endif
 /* Dummy functions */
 static char *null_libintl_gettext(const char *);
@@ -614,14 +615,18 @@
     };
     HINSTANCE hmsvcrt;
 
-    /* No need to initialize twice. */
-    if (hLibintlDLL)
+    // No need to initialize twice.
+    if (hLibintlDLL != NULL)
 	return 1;
-    /* Load gettext library (libintl.dll) */
+    // Load gettext library (libintl.dll and other names).
     hLibintlDLL = vimLoadLib(GETTEXT_DLL);
-#ifdef GETTEXT_DLL_ALT
+#ifdef GETTEXT_DLL_ALT1
     if (!hLibintlDLL)
-	hLibintlDLL = vimLoadLib(GETTEXT_DLL_ALT);
+	hLibintlDLL = vimLoadLib(GETTEXT_DLL_ALT1);
+#endif
+#ifdef GETTEXT_DLL_ALT2
+    if (!hLibintlDLL)
+	hLibintlDLL = vimLoadLib(GETTEXT_DLL_ALT2);
 #endif
     if (!hLibintlDLL)
     {