Mercurial > vim

comparison src/os_win32.c @ 14881:35aff6b8a2c7 v8.1.0452

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0452: MS-Windows: not finding intl.dll commit https://github.com/vim/vim/commit/7554c548a493cba50b2d0ea3521cac14f28a1f07 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Oct 6 15:03:15 2018 +0200 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)
author Bram Moolenaar <Bram@vim.org>
date Sat, 06 Oct 2018 15:15:07 +0200
parents ccedb80725c5
children 1c2ba2b0227e
comparison
equal deleted inserted replaced
14880:1f6468848d09 14881:35aff6b8a2c7
571 #endif 571 #endif
572 572
573 #if defined(DYNAMIC_GETTEXT) || defined(PROTO) 573 #if defined(DYNAMIC_GETTEXT) || defined(PROTO)
574 # ifndef GETTEXT_DLL 574 # ifndef GETTEXT_DLL
575 # define GETTEXT_DLL "libintl.dll" 575 # define GETTEXT_DLL "libintl.dll"
576 # define GETTEXT_DLL_ALT "libintl-8.dll" 576 # define GETTEXT_DLL_ALT1 "libintl-8.dll"
577 # define GETTEXT_DLL_ALT2 "intl.dll"
577 # endif 578 # endif
578 /* Dummy functions */ 579 /* Dummy functions */
579 static char *null_libintl_gettext(const char *); 580 static char *null_libintl_gettext(const char *);
580 static char *null_libintl_ngettext(const char *, const char *, unsigned long n); 581 static char *null_libintl_ngettext(const char *, const char *, unsigned long n);
581 static char *null_libintl_textdomain(const char *); 582 static char *null_libintl_textdomain(const char *);
612 {"bindtextdomain", (FARPROC*)&dyn_libintl_bindtextdomain}, 613 {"bindtextdomain", (FARPROC*)&dyn_libintl_bindtextdomain},
613 {NULL, NULL} 614 {NULL, NULL}
614 }; 615 };
615 HINSTANCE hmsvcrt; 616 HINSTANCE hmsvcrt;
616 617
617 /* No need to initialize twice. */ 618 // No need to initialize twice.
618 if (hLibintlDLL) 619 if (hLibintlDLL != NULL)
619 return 1; 620 return 1;
620 /* Load gettext library (libintl.dll) */ 621 // Load gettext library (libintl.dll and other names).
621 hLibintlDLL = vimLoadLib(GETTEXT_DLL); 622 hLibintlDLL = vimLoadLib(GETTEXT_DLL);
622 #ifdef GETTEXT_DLL_ALT 623 #ifdef GETTEXT_DLL_ALT1
623 if (!hLibintlDLL) 624 if (!hLibintlDLL)
624 hLibintlDLL = vimLoadLib(GETTEXT_DLL_ALT); 625 hLibintlDLL = vimLoadLib(GETTEXT_DLL_ALT1);
626 #endif
627 #ifdef GETTEXT_DLL_ALT2
628 if (!hLibintlDLL)
629 hLibintlDLL = vimLoadLib(GETTEXT_DLL_ALT2);
625 #endif 630 #endif
626 if (!hLibintlDLL) 631 if (!hLibintlDLL)
627 { 632 {
628 if (p_verbose > 0) 633 if (p_verbose > 0)
629 { 634 {