summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-03-13 17:01:52 +0100
committerBram Moolenaar <bram@vim.org>2013-03-13 17:01:52 +0100
commit901adb134309c60852dbc604b42247cba6cf0cb6 (patch)
treea2d8d03af28014ba3f4faffe6410e7c63e77ce80
parent12f3644a02c483b1768f73f34c477b1c49e815ac (diff)
downloadvim-901adb134309c60852dbc604b42247cba6cf0cb6.tar.gz
updated for version 7.3.855v7.3.855v7-3-855
Problem: Compiler warnings. Solution: Add type casts. (Mike Williams)
-rw-r--r--src/misc1.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/misc1.c b/src/misc1.c
index 5d1cba78..5003ae5b 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -5468,7 +5468,7 @@ cin_isinit(void)
for (i = 0; i < (int)(sizeof(skip) / sizeof(char *)); ++i)
{
- l = strlen(skip[i]);
+ l = (int)strlen(skip[i]);
if (cin_starts_with(s, skip[i]))
{
s = cin_skipcomment(s + l);
@@ -6430,7 +6430,7 @@ cin_starts_with(s, word)
char_u *s;
char *word;
{
- int l = STRLEN(word);
+ int l = (int)STRLEN(word);
return (STRNCMP(s, word, l) == 0 && !vim_isIDc(s[l]));
}
diff --git a/src/version.c b/src/version.c
index 7c1e274e..504ba7f1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 855,
+/**/
854,
/**/
853,