Mercurial > vim
changeset 23090:fb27d3a7a24b v8.2.2091
patch 8.2.2091: MS-Windows: build warnings
Commit: https://github.com/vim/vim/commit/29d2f45c8855fd98897c5db92d896c161e95d0f1
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Dec 4 19:42:52 2020 +0100
patch 8.2.2091: MS-Windows: build warnings
Problem: MS-Windows: build warnings.
Solution: Add a #pragma to suppress the deprecation warning. (Ken Takata)
Avoid using a non-ASCII character. (closes #7421)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 04 Dec 2020 19:45:03 +0100 |
| parents | beedb1cba6dd |
| children | dd27e20498a3 |
| files | src/message.c src/os_win32.c src/version.c |
| diffstat | 3 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/message.c +++ b/src/message.c @@ -1861,7 +1861,7 @@ msg_prt_line(char_u *s, int list) col += (*mb_ptr2cells)(s); if (l >= MB_MAXBYTES) { - STRCPY(buf, "¿"); + STRCPY(buf, "?"); } else if (lcs_nbsp != NUL && list && (mb_ptr2char(s) == 160
--- a/src/os_win32.c +++ b/src/os_win32.c @@ -860,6 +860,12 @@ win32_enable_privilege(LPTSTR lpszPrivil } #endif +#ifdef _MSC_VER +// Suppress the deprecation warning for using GetVersionEx(). +// It is needed for implementing "windowsversion()". +# pragma warning(push) +# pragma warning(disable: 4996) +#endif /* * Set "win8_or_later" and fill in "windowsVersion" if possible. */ @@ -890,6 +896,9 @@ PlatformId(void) done = TRUE; } } +#ifdef _MSC_VER +# pragma warning(pop) +#endif #if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL)