patch 7.4.1861

Problem:    Compiler warnings with 64 bit compiler.
Solution:   Change int to size_t. (Mike William)

diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 9adaea357d68c6dc9457b1f0dc2093cb3d25c17d..5efe0ec15a6301f1a1742248cabfc6dd041c725e 100644 (file)
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -3343,10 +3343,10 @@ add_pack_plugin(char_u *fname, void *cookie)
     int            c;
     char_u  *new_rtp;
     int            keep;
-    int            oldlen;
-    int            addlen;
+    size_t  oldlen;
+    size_t  addlen;
     char_u  *afterdir;
-    int            afterlen = 0;
+    size_t  afterlen = 0;
     char_u  *ffname = fix_fname(fname);
 
     if (ffname == NULL)
@@ -3386,9 +3386,9 @@ add_pack_plugin(char_u *fname, void *cookie)
        if (afterdir != NULL && mch_isdir(afterdir))
            afterlen = STRLEN(afterdir) + 1; /* add one for comma */
 
-       oldlen = (int)STRLEN(p_rtp);
-       addlen = (int)STRLEN(ffname) + 1; /* add one for comma */
-       new_rtp = alloc(oldlen + addlen + afterlen + 1); /* add one for NUL */
+       oldlen = STRLEN(p_rtp);
+       addlen = STRLEN(ffname) + 1; /* add one for comma */
+       new_rtp = alloc((int)(oldlen + addlen + afterlen + 1)); /* add one for NUL */
        if (new_rtp == NULL)
            goto theend;
        keep = (int)(insp - p_rtp);

diff --git a/src/version.c b/src/version.c
index 515f5187625e8f1525c3a317ec3848edda836ea8..bf77c87e95f4ed4c68ee29882467a68b95489ddd 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1861,
 /**/
     1860,
 /**/