summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Brabandt <cb@256bit.org>2021-07-30 20:51:59 +0200
committerBram Moolenaar <Bram@vim.org>2021-07-30 20:51:59 +0200
commit1790be6cb6f2edfd8a833dd848b8df02cef599cf (patch)
tree60fdac22b036c6870fe401c6a9a7b531aa05f367
parent60dc8274e9f8c6a20d54efebc7a8752fe062eead (diff)
downloadvim-git-1790be6cb6f2edfd8a833dd848b8df02cef599cf.tar.gz
patch 8.2.3250: MS-Windows: cannot build with libsodiumv8.2.3250
Problem: MS-Windows: cannot build with libsodium. Solution: Change FEAT_SODIUM into HAVE_SODIUM. (Christian Brabandt, closes #8668, closes #8663)
-rw-r--r--src/Make_mvc.mak2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 8c8e71afd..18b5a88c5 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -395,7 +395,7 @@ SODIUM = no
!if "$(SODIUM)" != "no"
SOD_INC = /I "$(SODIUM)\include"
-SOD_DEFS = -DFEAT_SODIUM
+SOD_DEFS = -DHAVE_SODIUM
SOD_LIB = $(SOD_LIB)\libsodium.lib
!endif
diff --git a/src/version.c b/src/version.c
index 33f419659..f324f3d97 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3250,
+/**/
3249,
/**/
3248,