summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-09-16 14:51:36 +0200
committerBram Moolenaar <Bram@vim.org>2018-09-16 14:51:36 +0200
commit6e272acc82af900318017061f923e7f66dc7ee7a (patch)
treedccedf1934e5471fa11b0b49496eadef886789d5
parente3521d9cbb786806eaff106707851d37d2c0ecef (diff)
downloadvim-git-6e272acc82af900318017061f923e7f66dc7ee7a.tar.gz
patch 8.1.0395: compiler warning on 64-bit MS-Windowsv8.1.0395
Problem: Compiler warning on 64-bit MS-Windows. Solution: Add type cast. (Mike Williams)
-rw-r--r--src/diff.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/diff.c b/src/diff.c
index 69ba7a389..02f1c3325 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -712,7 +712,7 @@ diff_write_buffer(buf_T *buf, diffin_T *din)
// xdiff requires one big block of memory with all the text.
for (lnum = 1; lnum <= buf->b_ml.ml_line_count; ++lnum)
- len += STRLEN(ml_get_buf(buf, lnum, FALSE)) + 1;
+ len += (long)STRLEN(ml_get_buf(buf, lnum, FALSE)) + 1;
ptr = lalloc(len, TRUE);
if (ptr == NULL)
{
diff --git a/src/version.c b/src/version.c
index 29557cdf6..7b6b07fc3 100644
--- 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 */
/**/
+ 395,
+/**/
394,
/**/
393,