updated for version 7.4.081

Problem:    Wrong logic when ANALYZE is "yes".
Solution:   Use or instead of and. (KF Leong)

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 9ae64db79e804a6475f319c351e186a278579bbf..5a07cd095d0d89e9c5b7f98c6f4871a494642741 100644 (file)
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -488,7 +488,7 @@ CFLAGS=$(CFLAGS) $(WP64CHECK)
 !endif
 
 # Static code analysis generally available starting with VS2012
-!if ("$(ANALYZE)" == "yes") && ("$(MSVCVER)" == "11.0") && ("$(MSVCVER)" == "12.0")
+!if ("$(ANALYZE)" == "yes") && (("$(MSVCVER)" == "10.0") || ("$(MSVCVER)" == "11.0") || ("$(MSVCVER)" == "12.0"))
 CFLAGS=$(CFLAGS) /analyze
 !endif
 

diff --git a/src/version.c b/src/version.c
index 795aad06b6c28f1c357b3fc50749e745ec6eedea..fdde4a9fab02d9b26bcc0baf24a4b810f2f12ace 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    81,
 /**/
     80,
 /**/