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 5736463f48a2a2d9de760d39c0f13ca3ec5d7c73..f6d4b05e04e9c7b8d9ade9bb340cdc4560e36b64 100644 (file)
--- 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 bd51666a2b4b3193084b9a117f402f205b59f2b2..81e38243575b492ee01b13f326d605314f51e26a 100644 (file)
--- 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,
 /**/