summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-06-04 21:32:49 +0200
committerBram Moolenaar <Bram@vim.org>2020-06-04 21:32:49 +0200
commit852ea366d6432e719ffdd95e9fb7d49a9a960187 (patch)
treea43d7fb527b0f67ad203320c6898638c8c78bb9c
parent442a85369f3eb9834dbab42add45f7c4106700f4 (diff)
downloadvim-git-852ea366d6432e719ffdd95e9fb7d49a9a960187.tar.gz
patch 8.2.0903: comparing WINVER does not work correctlyv8.2.0903
Problem: comparing WINVER does not work correctly. Solution: Use arithmethic expansion. (Ozaki Kiichi, closes #6197)
-rw-r--r--src/Make_cyg_ming.mak2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 39f1e847d..890c9568e 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -625,7 +625,7 @@ endif
ifeq ($(CHANNEL),yes)
DEFINES += -DFEAT_JOB_CHANNEL -DFEAT_IPV6
- ifeq ($(shell expr "$(WINVER)" \>= 0x600),1)
+ ifeq ($(shell expr "$$(($(WINVER)))" \>= "$$((0x600))"),1)
DEFINES += -DHAVE_INET_NTOP
endif
endif
diff --git a/src/version.c b/src/version.c
index bb183674f..399886e34 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 */
/**/
+ 903,
+/**/
902,
/**/
901,