summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-04-29 19:47:22 +0200
committerBram Moolenaar <Bram@vim.org>2019-04-29 19:47:22 +0200
commitc0af78fa0869d39314336faef36239f62f09e148 (patch)
tree96400e4a5afcba8e62caf9e53ba58866550cef04
parent701df4eb64ae9945c63f83621b54aa69e1336a79 (diff)
downloadvim-git-8.1.1235.tar.gz
patch 8.1.1235: compiler warnings for using STRLEN() valuev8.1.1235
Problem: Compiler warnings for using STRLEN() value. Solution: Cast to int. (Christian Brabandt, Mike Williams)
-rw-r--r--src/tag.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/tag.c b/src/tag.c
index 5ab4eaab2..1242668a8 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -1391,7 +1391,7 @@ find_tagfunc_tags(
if (tv->v_type != VAR_STRING || tv->vval.v_string == NULL)
continue;
- len += STRLEN(tv->vval.v_string) + 1; // Space for "\tVALUE"
+ len += (int)STRLEN(tv->vval.v_string) + 1; // Space for "\tVALUE"
if (!STRCMP(dict_key, "name"))
{
res_name = tv->vval.v_string;
@@ -1415,7 +1415,7 @@ find_tagfunc_tags(
}
// Other elements will be stored as "\tKEY:VALUE"
// Allocate space for the key and the colon
- len += STRLEN(dict_key) + 1;
+ len += (int)STRLEN(dict_key) + 1;
}
if (has_extra)
diff --git a/src/version.c b/src/version.c
index c082c065c..5cba45655 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1235,
+/**/
1234,
/**/
1233,