From 434df7a401c92d4084bb0a01ffd6d1737ae0193b Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 16 Aug 2021 21:15:32 +0200
Subject: [PATCH] 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.
---
src/memline.c | 4 ++--
src/version.c | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/memline.c b/src/memline.c
index f4649841fb..5aeee900f2 100644
--- 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);
diff --git a/src/version.c b/src/version.c
index eed8bb0d96..7f1f496158 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 3355,
/**/
3354,
/**/
--
GitLab