mirror of
https://github.com/vim/vim.git
synced 2025-09-09 22:23:37 -04:00
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:
parent
c5e6a7179d
commit
29d2f45c88
@ -1861,7 +1861,7 @@ msg_prt_line(char_u *s, int list)
|
|||||||
col += (*mb_ptr2cells)(s);
|
col += (*mb_ptr2cells)(s);
|
||||||
if (l >= MB_MAXBYTES)
|
if (l >= MB_MAXBYTES)
|
||||||
{
|
{
|
||||||
STRCPY(buf, "¿");
|
STRCPY(buf, "?");
|
||||||
}
|
}
|
||||||
else if (lcs_nbsp != NUL && list
|
else if (lcs_nbsp != NUL && list
|
||||||
&& (mb_ptr2char(s) == 160
|
&& (mb_ptr2char(s) == 160
|
||||||
|
@ -860,6 +860,12 @@ win32_enable_privilege(LPTSTR lpszPrivilege, BOOL bEnable)
|
|||||||
}
|
}
|
||||||
#endif
|
#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.
|
* Set "win8_or_later" and fill in "windowsVersion" if possible.
|
||||||
*/
|
*/
|
||||||
@ -890,6 +896,9 @@ PlatformId(void)
|
|||||||
done = TRUE;
|
done = TRUE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
# pragma warning(pop)
|
||||||
|
#endif
|
||||||
|
|
||||||
#if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL)
|
#if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL)
|
||||||
|
|
||||||
|
@ -750,6 +750,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
2091,
|
||||||
/**/
|
/**/
|
||||||
2090,
|
2090,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user