summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-07-04 21:19:33 +0200
committerBram Moolenaar <Bram@vim.org>2013-07-04 21:19:33 +0200
commit61214040e91dc4635170a0c985a0ef2f5ffa2c55 (patch)
tree89bfda9e3691f98d82aff0ad4a3a8aef56a596e7
parenta3c084cbfa553e9d7b91004755a2cc0508cfb1a9 (diff)
downloadvim-git-61214040e91dc4635170a0c985a0ef2f5ffa2c55.tar.gz
updated for version 7.3.1305v7.3.1305
Problem: Warnings from 64 bit compiler. Solution: Add type casts.
-rw-r--r--src/misc2.c13
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 6 deletions
diff --git a/src/misc2.c b/src/misc2.c
index 960de029c..86a1f9def 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -4680,8 +4680,9 @@ vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what,
STRCPY(ff_expand_buffer, search_ctx->ffsc_start_dir);
add_pathsep(ff_expand_buffer);
{
- int eb_len = STRLEN(ff_expand_buffer);
- char_u *buf = alloc(eb_len + STRLEN(search_ctx->ffsc_fix_path) + 1);
+ int eb_len = (int)STRLEN(ff_expand_buffer);
+ char_u *buf = alloc(eb_len
+ + (int)STRLEN(search_ctx->ffsc_fix_path) + 1);
STRCPY(buf, ff_expand_buffer);
STRCPY(buf + eb_len, search_ctx->ffsc_fix_path);
@@ -4700,18 +4701,18 @@ vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what,
if (p > search_ctx->ffsc_fix_path)
{
- len = p - search_ctx->ffsc_fix_path - 1;
+ len = (int)(p - search_ctx->ffsc_fix_path) - 1;
STRNCAT(ff_expand_buffer, search_ctx->ffsc_fix_path, len);
add_pathsep(ff_expand_buffer);
}
else
- len = STRLEN(search_ctx->ffsc_fix_path);
+ len = (int)STRLEN(search_ctx->ffsc_fix_path);
if (search_ctx->ffsc_wc_path != NULL)
{
wc_path = vim_strsave(search_ctx->ffsc_wc_path);
- temp = alloc(STRLEN(search_ctx->ffsc_wc_path)
- + (STRLEN(search_ctx->ffsc_fix_path) - len));
+ temp = alloc((int)(STRLEN(search_ctx->ffsc_wc_path)
+ + (STRLEN(search_ctx->ffsc_fix_path)) - len));
}
if (temp == NULL || wc_path == NULL)
diff --git a/src/version.c b/src/version.c
index 494df1247..112250606 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 */
/**/
+ 1305,
+/**/
1304,
/**/
1303,