diff options
| author | Bram Moolenaar <bram@vim.org> | 2013-11-09 02:32:18 +0100 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2013-11-09 02:32:18 +0100 |
| commit | 427bae2836c010d65ca53ba2895fa991461cc0ef (patch) | |
| tree | b1d52e06f13f1bc96f1aadcc95ff63d7ef9f742f | |
| parent | 8851100f9df90b310428bd3c62b5aa72e71c0d95 (diff) | |
| download | vim-427bae2836c010d65ca53ba2895fa991461cc0ef.tar.gz | |
Problem: Wrong logic when ANALYZE is "yes".
Solution: Use or instead of and. (KF Leong)
| -rw-r--r-- | src/Make_mvc.mak | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 9ae64db7..5a07cd09 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 795aad06..fdde4a9f 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 81, +/**/ 80, /**/ 79, |