From 815135e4082dce22a264cc1f176187221d5313cf Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 9 Nov 2013 02:32:18 +0100 Subject: [PATCH] updated for version 7.4.081 Problem: Wrong logic when ANALYZE is "yes". Solution: Use or instead of and. (KF Leong) --- src/Make_mvc.mak | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 9ae64db79..5a07cd095 100644 --- 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 795aad06b..fdde4a9fa 100644 --- 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, /**/ -- 2.50.1