From 35be4534c029148a89ccc41e8e465d793e7ed7c2 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 11 Dec 2015 22:38:36 +0100 Subject: [PATCH] patch 7.4.969 Problem: Compiler warnings on Windowx x64 build. Solution: Add type casts. (Mike Williams) --- src/option.c | 4 ++-- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/option.c b/src/option.c index f8cb1ba7c..3f98f47b8 100644 --- 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 40a877d43..62990fc66 100644 --- 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, /**/