1
0
forked from aniani/vim

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)
This commit is contained in:
Bram Moolenaar 2020-12-04 19:42:52 +01:00
parent c5e6a7179d
commit 29d2f45c88
3 changed files with 12 additions and 1 deletions

View File

@ -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

View File

@ -860,6 +860,12 @@ win32_enable_privilege(LPTSTR lpszPrivilege, BOOL bEnable)
}
#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)

View File

@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2091,
/**/
2090,
/**/