changeset 14768:64a63f48d8cd v8.1.0396

patch 8.1.0396: another compiler warning on 64-bit MS-Windows commit https://github.com/vim/vim/commit/42c63356d774bbfe91712197e8969f60de828a32 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Sep 16 15:14:18 2018 +0200 patch 8.1.0396: another compiler warning on 64-bit MS-Windows Problem: Another compiler warning on 64-bit MS-Windows. Solution: Add type cast. (Mike Williams)
author Christian Brabandt <cb@256bit.org>
date Sun, 16 Sep 2018 15:15:05 +0200
parents dcffa2b56a0a
children a81c7ba51880
files src/version.c src/xdiff/xutils.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    396,
+/**/
     395,
 /**/
     394,
--- a/src/xdiff/xutils.c
+++ b/src/xdiff/xutils.c
@@ -51,7 +51,7 @@ int xdl_emit_diffrec(char const *rec, lo
 	mb[1].size = size;
 	if (size > 0 && rec[size - 1] != '\n') {
 		mb[2].ptr = (char *) "\n\\ No newline at end of file\n";
-		mb[2].size = strlen(mb[2].ptr);
+		mb[2].size = (long)strlen(mb[2].ptr);
 		i++;
 	}
 	if (ecb->outf(ecb->priv, mb, i) < 0) {