Mercurial > vim
diff src/os_win32.c @ 7613:4456fa2d22e8 v7.4.1106
commit https://github.com/vim/vim/commit/286eacd3f6631e985089176fb1dff1bcf1a1d6b5
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 16 18:05:50 2016 +0100
patch 7.4.1106
Problem: The nsis script can't be used from the appveyor build.
Solution: Add "ifndef" to allow for variables to be set from the command
line. Remove duplicate SetCompressor command. Support using other
gettext binaries. (Ken Takata) Update build instructions to use
libintl-8.dll.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 16 Jan 2016 18:15:05 +0100 |
| parents | 1420ccc9f610 |
| children | 6fed43c541c8 |
line wrap: on
line diff
--- a/src/os_win32.c +++ b/src/os_win32.c @@ -463,6 +463,7 @@ vimLoadLib(char *name) #if defined(DYNAMIC_GETTEXT) || defined(PROTO) # ifndef GETTEXT_DLL # define GETTEXT_DLL "libintl.dll" +# define GETTEXT_DLL_ALT "libintl-8.dll" # endif /* Dummy functions */ static char *null_libintl_gettext(const char *); @@ -479,7 +480,7 @@ char *(*dyn_libintl_bind_textdomain_code = null_libintl_bind_textdomain_codeset; int -dyn_libintl_init(char *libname) +dyn_libintl_init() { int i; static struct @@ -498,7 +499,9 @@ dyn_libintl_init(char *libname) if (hLibintlDLL) return 1; /* Load gettext library (libintl.dll) */ - hLibintlDLL = vimLoadLib(libname != NULL ? libname : GETTEXT_DLL); + hLibintlDLL = vimLoadLib(GETTEXT_DLL); + if (!hLibintlDLL) + hLibintlDLL = vimLoadLib(GETTEXT_DLL_ALT); if (!hLibintlDLL) { if (p_verbose > 0)