patch 7.4.969

Problem:    Compiler warnings on Windowx x64 build.
Solution:   Add type casts. (Mike Williams)

diff --git a/src/option.c b/src/option.c
index f8cb1ba7cd1bd0255fcd5f4248a0511c9299f863..3f98f47b85356390b40e0d5bb7684cf903bed1a8 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -3287,8 +3287,8 @@ set_init_1()
            if (opt_idx >= 0)
            {
 #if !defined(HAVE_AVAIL_MEM) && !defined(HAVE_TOTAL_MEM)
-               if ((long)options[opt_idx].def_val[VI_DEFAULT] > (long)n
-                       || (long)options[opt_idx].def_val[VI_DEFAULT] == 0L)
+               if ((long)(long_i)options[opt_idx].def_val[VI_DEFAULT] > (long)n
+                 || (long)(long_i)options[opt_idx].def_val[VI_DEFAULT] == 0L)
 #endif
                    options[opt_idx].def_val[VI_DEFAULT] = (char_u *)n;
            }

diff --git a/src/version.c b/src/version.c
index 40a877d4337b4249e68707b381100f18f6adbe11..62990fc66bf19e770d6174c589caf38295c32380 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 */
+/**/
+    969,
 /**/
     968,
 /**/