diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-10-06 15:03:15 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-10-06 15:03:15 +0200 |
| commit | 7554c548a493cba50b2d0ea3521cac14f28a1f07 (patch) | |
| tree | 3bf0bd92e3572fda2ea0261bd4e0bf92a4425706 /src/os_win32.c | |
| parent | 2bc152ab53c4b01072edf6ec2ff61e504cb03cbe (diff) | |
| download | vim-git-7554c548a493cba50b2d0ea3521cac14f28a1f07.tar.gz | |
patch 8.1.0452: MS-Windows: not finding intl.dllv8.1.0452
Problem: MS-Windows: not finding intl.dll.
Solution: Also find intl.dll next to libintl.dll. (Ken Takata)
Diffstat (limited to 'src/os_win32.c')
| -rw-r--r-- | src/os_win32.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index a53b7b627..4ba060bb9 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -573,7 +573,8 @@ get_dll_import_func(HINSTANCE hInst, const char *funcname) #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 @@ dyn_libintl_init(void) }; 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_ALT1); +#endif +#ifdef GETTEXT_DLL_ALT2 if (!hLibintlDLL) - hLibintlDLL = vimLoadLib(GETTEXT_DLL_ALT); + hLibintlDLL = vimLoadLib(GETTEXT_DLL_ALT2); #endif if (!hLibintlDLL) { |