patch 8.2.0903: comparing WINVER does not work correctly

Problem:    comparing WINVER does not work correctly.
Solution:   Use arithmethic expansion. (Ozaki Kiichi, closes #6197)

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 39f1e847d6dcef2b8da68ce83fdab2a594b1996a..890c9568e03cfea05b71491c8b5f8a71d0b1edec 100644 (file)
--- 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 bb183674f4830bb2f469c480712301b3a69acaa5..399886e349f59bfe691cf2955a55bf73ccd471c1 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 */
+/**/
+    903,
 /**/
     902,
 /**/