summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-04-29 15:55:43 +0200
committerBram Moolenaar <Bram@vim.org>2014-04-29 15:55:43 +0200
commit121f9bdde4a474ae729fd0b1e5fc9ad1ffcd8651 (patch)
tree57700192b699f8a5abc53beb5a14db6de9afe930
parent1ff32c5c2cec3597a5695ca79825ab53441dbf06 (diff)
downloadvim-git-121f9bdde4a474ae729fd0b1e5fc9ad1ffcd8651.tar.gz
updated for version 7.4.271v7.4.271
Problem: Compiler warning on 64 bit windows. Solution: Add type cast. (Mike Williams)
-rw-r--r--src/ops.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ops.c b/src/ops.c
index c0337352e..0348353fc 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -6559,7 +6559,7 @@ str_to_reg(y_ptr, yank_type, str, len, blocklen, str_list)
{
for (ss = (char_u **) str; *ss != NULL; ++ss, ++lnum)
{
- i = STRLEN(*ss);
+ i = (long)STRLEN(*ss);
pp[lnum] = vim_strnsave(*ss, i);
if (i > maxlen)
maxlen = i;
diff --git a/src/version.c b/src/version.c
index b41ffc297..929925793 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 */
/**/
+ 271,
+/**/
270,
/**/
269,