summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-05-08 12:52:05 +0200
committerBram Moolenaar <Bram@vim.org>2016-05-08 12:52:05 +0200
commitd9db8b448c214eb583e84c598bca0688b9202ba7 (patch)
tree3ecc150fb67f33c48ac59a4f72abe8e10f0cdae9
parent91c4937be15b0b743b6bc495df602c1abbff6b87 (diff)
patch 7.4.1823v7.4.1823
Problem: Warning from 64 bit compiler. Solution: Add type cast. (Mike Williams)
-rw-r--r--src/quickfix.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/quickfix.c b/src/quickfix.c
index db4c0fa7fc..7b6d1bc9ce 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -675,7 +675,7 @@ qf_init_ext(
if (fgets((char *)growbuf + growbuflen,
growbufsiz - growbuflen, fd) == NULL)
break;
- linelen = STRLEN(growbuf + growbuflen);
+ linelen = (int)STRLEN(growbuf + growbuflen);
growbuflen += linelen;
if (growbuf[growbuflen - 1] == '\n'
#ifdef USE_CRNL
diff --git a/src/version.c b/src/version.c
index 36eba983f7..f494c223b4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1823,
+/**/
1822,
/**/
1821,