updated for version 7.4.626

Problem:    MSVC with W4 gives useless warnings.
Solution:   Disable more warnings. (Mike Williams)

diff --git a/src/version.c b/src/version.c
index c14eac35bb953340969c083d3bbdd10e35016e07..8ef229acb9259f7c27d69d85e99b152828dfc6de 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    626,
 /**/
     625,
 /**/

diff --git a/src/vim.h b/src/vim.h
index e35987951b24b1aac27e180aae8a70ea322b499f..a7bb00170cb2bc79aa833618259518e388105470 100644 (file)
--- 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. */