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
index 960de029c338cb6b4ad74d01bd9768d348577416..86a1f9def29b197328b4dcb7ea46c4bd6c8fc09e 100644 (file)
--- 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 494df1247e4dbcfe150601bfc28e29c7da5e1d82..11225060651cd5365fe50dfd932debd675a58e37 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1305,
 /**/
     1304,
 /**/