From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 17 Apr 2022 09:57:44 +0000 (+0100)
Subject: patch 8.2.4769: build warning with UCRT
X-Git-Tag: v8.2.4769
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68aaff4697bab4a278436e6f7ae042262223e51c;p=thirdparty%2Fvim.git

patch 8.2.4769: build warning with UCRT

Problem:    Build warning with UCRT.
Solution:   Adjust #ifdef for _wenviron. (John Marriott)
---

diff --git a/src/evalfunc.c b/src/evalfunc.c
index 5736463f48..f6d4b05e04 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -3673,8 +3673,10 @@ f_environ(typval_T *argvars UNUSED, typval_T *rettv)
 #if !defined(AMIGA)
     int			i = 0;
     char_u		*entry, *value;
-# ifdef MSWIN
+# if defined (MSWIN)
+#  if !defined(_UCRT)
     extern wchar_t	**_wenviron;
+#  endif
 # else
     extern char		**environ;
 # endif
diff --git a/src/version.c b/src/version.c
index bd51666a2b..81e3824357 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4769,
 /**/
     4768,
 /**/