# HG changeset patch # User Bram Moolenaar # Date 1372965573 -7200 # Node ID 6f24376028af97c93b426cdbd46379795be7cdfd # Parent fe4ec4b1d8a7f5f657a91c64214c9c157b5bd06a updated for version 7.3.1305 Problem: Warnings from 64 bit compiler. Solution: Add type casts. diff --git a/src/misc2.c b/src/misc2.c --- a/src/misc2.c +++ b/src/misc2.c @@ -4680,8 +4680,9 @@ vim_findfile_init(path, filename, stopdi 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, stopdi 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 --- 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,