diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-04-17 10:57:44 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-04-17 10:57:44 +0100 |
commit | 68aaff4697bab4a278436e6f7ae042262223e51c (patch) | |
tree | cd8c14c65eda1deb2aed8ca594f4428b16f125b4 | |
parent | 34ffa102806da6b7562a010a2dca08448d3cc465 (diff) | |
download | vim-git-68aaff4697bab4a278436e6f7ae042262223e51c.tar.gz |
patch 8.2.4769: build warning with UCRTv8.2.4769
Problem: Build warning with UCRT.
Solution: Adjust #ifdef for _wenviron. (John Marriott)
-rw-r--r-- | src/evalfunc.c | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 5736463f4..f6d4b05e0 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 bd51666a2..81e382435 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4769, +/**/ 4768, /**/ 4767, |