summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 5ab4eaab23..1242668a84 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 c082c065cc..5cba456553 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,