changeset 25638:960ff2a7d921 v8.2.3355

patch 8.2.3355: MS-Windows: compiler warning for 64-32 bit conversion Commit: https://github.com/vim/vim/commit/434df7a401c92d4084bb0a01ffd6d1737ae0193b Author: Bram Moolenaar <Bram@vim.org> Date: Mon Aug 16 21:15:32 2021 +0200 patch 8.2.3355: MS-Windows: compiler warning for 64-32 bit conversion Problem: MS-Windows: compiler warning for 64-32 bit conversion. Solution: Add type casts.
author Bram Moolenaar <Bram@vim.org>
date Mon, 16 Aug 2021 21:30:04 +0200
parents 208c9bcf6cf7
children b5eedbdaca91
files src/memline.c src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/memline.c
+++ b/src/memline.c
@@ -4000,7 +4000,7 @@ ml_flush_line(buf_T *buf)
 		dp->db_txt_start -= extra;
 #if defined(FEAT_BYTEOFF) && defined(FEAT_PROP_POPUP)
 		if (buf->b_has_textprop)
-		    old_prop_len = old_len - STRLEN(new_line) - 1;
+		    old_prop_len = old_len - (int)STRLEN(new_line) - 1;
 #endif
 
 		// copy new line into the data block
@@ -4012,7 +4012,7 @@ ml_flush_line(buf_T *buf)
 		{
 		    // Do not count the size of any text properties.
 		    extra += old_prop_len;
-		    extra -= new_len - STRLEN(new_line) - 1;
+		    extra -= new_len - (int)STRLEN(new_line) - 1;
 		}
 		if (extra != 0)
 		    ml_updatechunk(buf, lnum, (long)extra, ML_CHNK_UPDLINE);
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3355,
+/**/
     3354,
 /**/
     3353,