summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-05-29 14:36:29 +0200
committerBram Moolenaar <Bram@vim.org>2014-05-29 14:36:29 +0200
commit7116aa0f7d4c3f50f6898798c3047f5232aabe4a (patch)
tree289c52e8e54bf3f0d771ab7333c902d232598034
parentc35b0fb181264658e8221b1ccb249e8551af8a59 (diff)
downloadvim-git-7116aa0f7d4c3f50f6898798c3047f5232aabe4a.tar.gz
updated for version 7.4.316v7.4.316
Problem: Warning from 64-bit compiler. Solution: Add type cast. (Mike Williams)
-rw-r--r--src/ex_getln.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 741173244..7659a37ff 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -5202,7 +5202,7 @@ globpath(path, file, ga, expand_options)
for (i = 0; i < num_p; ++i)
{
((char_u **)ga->ga_data)[ga->ga_len] =
- vim_strnsave(p[i], STRLEN(p[i]));
+ vim_strnsave(p[i], (int)STRLEN(p[i]));
++ga->ga_len;
}
}
diff --git a/src/version.c b/src/version.c
index 28a4136d3..6c113c7b0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 316,
+/**/
315,
/**/
314,