changeset 13630:fd3389d64825 v8.0.1687

patch 8.0.1687: 64 bit compiler warnings commit https://github.com/vim/vim/commit/d6b4f2dd760b425c63c359b9ff299f73448f8854 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Apr 10 18:26:27 2018 +0200 patch 8.0.1687: 64 bit compiler warnings Problem: 64 bit compiler warnings. Solution: change type, add type cast. (Mike Williams)
author Christian Brabandt <cb@256bit.org>
date Tue, 10 Apr 2018 18:30:07 +0200
parents 21036fdd939d
children 5088c187e55c
files src/terminal.c src/version.c
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -3400,7 +3400,7 @@ static VTermParserCallbacks parser_fallb
     static void *
 vterm_malloc(size_t size, void *data UNUSED)
 {
-    return alloc_clear(size);
+    return alloc_clear((unsigned) size);
 }
 
     static void
@@ -4016,9 +4016,9 @@ get_separator(int text_width, char_u *fn
     int	    fname_size;
     char_u  *p = fname;
     int	    i;
-    int	    off;
-
-    textline = alloc(width + STRLEN(fname) + 1);
+    size_t  off;
+
+    textline = alloc(width + (int)STRLEN(fname) + 1);
     if (textline == NULL)
 	return NULL;
 
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1687,
+/**/
     1686,
 /**/
     1685,