From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 4 Dec 2020 18:42:52 +0000 (+0100)
Subject: patch 8.2.2091: MS-Windows: build warnings
X-Git-Tag: v8.2.2091
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29d2f45c8855fd98897c5db92d896c161e95d0f1;p=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)
---

diff --git a/src/message.c b/src/message.c
index 3f6d56e5d..43e7e5e52 100644
--- 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
diff --git a/src/os_win32.c b/src/os_win32.c
index 21b9b0127..2f9ecdc9e 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -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)
 
diff --git a/src/version.c b/src/version.c
index 2061ea0a3..0002ef888 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2091,
 /**/
     2090,
 /**/