summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-02-10 18:47:58 +0100
committerBram Moolenaar <Bram@vim.org>2015-02-10 18:47:58 +0100
commiteb2928595bca45cb37f0906c76896dce806b5543 (patch)
tree50f01ff721245a9a5f1762ab8236513399c0cc87
parent24a6ff88bc8710c305deba405d00061dec909125 (diff)
downloadvim-git-eb2928595bca45cb37f0906c76896dce806b5543.tar.gz
updated for version 7.4.626v7.4.626
Problem: MSVC with W4 gives useless warnings. Solution: Disable more warnings. (Mike Williams)
-rw-r--r--src/version.c2
-rw-r--r--src/vim.h14
2 files changed, 16 insertions, 0 deletions
diff --git a/src/version.c b/src/version.c
index c14eac35b..8ef229acb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 626,
+/**/
625,
/**/
624,
diff --git a/src/vim.h b/src/vim.h
index e35987951..a7bb00170 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -2044,6 +2044,20 @@ typedef int VimClipboard; /* This is required for the prototypes. */
#ifdef _MSC_VER
/* Avoid useless warning "conversion from X to Y of greater size". */
#pragma warning(disable : 4312)
+/* Avoid warning for old style function declarators */
+ #pragma warning(disable : 4131)
+/* Avoid warning for conversion to type with smaller range */
+ #pragma warning(disable : 4244)
+/* Avoid warning for conversion to larger size */
+ #pragma warning(disable : 4306)
+/* Avoid warning for unreferenced formal parameter */
+ #pragma warning(disable : 4100)
+/* Avoid warning for differs in indirection to slightly different base type */
+ #pragma warning(disable : 4057)
+/* Avoid warning for constant conditional expression */
+ #pragma warning(disable : 4127)
+/* Avoid warning for assignment within conditional */
+ #pragma warning(disable : 4706)
#endif
/* Note: a NULL argument for vim_realloc() is not portable, don't use it. */