Mercurial > vim

changeset 7328:6679f41bddea v7.4.969

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/35be4534c029148a89ccc41e8e465d793e7ed7c2 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Dec 11 22:38:36 2015 +0100 patch 7.4.969 Problem: Compiler warnings on Windowx x64 build. Solution: Add type casts. (Mike Williams)
author Christian Brabandt <cb@256bit.org>
date Fri, 11 Dec 2015 22:45:05 +0100
parents 8b6df255c088
children f5a4e5697665
files src/option.c src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
 	    }
--- 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 */
 /**/
+    969,
+/**/
     968,
 /**/
     967,