From d6b4f2dd760b425c63c359b9ff299f73448f8854 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 10 Apr 2018 18:26:27 +0200 Subject: [PATCH] patch 8.0.1687: 64 bit compiler warnings Problem: 64 bit compiler warnings. Solution: change type, add type cast. (Mike Williams) --- src/terminal.c | 6 +++--- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/terminal.c b/src/terminal.c index 785994138..9a62edd67 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -3400,7 +3400,7 @@ static VTermParserCallbacks parser_fallbacks = { 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 *fname) int fname_size; char_u *p = fname; int i; - int off; + size_t off; - textline = alloc(width + STRLEN(fname) + 1); + textline = alloc(width + (int)STRLEN(fname) + 1); if (textline == NULL) return NULL; diff --git a/src/version.c b/src/version.c index 08b672892..4fc5de022 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1687, /**/ 1686, /**/ -- 2.40.0