patch 7.4.1396

Problem:    Compiler warnings for conversions.
Solution:   Add type cast.

diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 9601409a71b90f268181f2aa3d84c2f02fab9bbd..e105fa00ba8a3825fa45ba09f8513de5eb9bdeb2 100644 (file)
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -3087,8 +3087,8 @@ source_pack_plugin(char_u *fname, void *cookie UNUSED)
     if (strstr((char *)p_rtp, (char *)fname) == NULL)
     {
        /* directory not in 'runtimepath', add it */
-       oldlen = STRLEN(p_rtp);
-       addlen = STRLEN(fname);
+       oldlen = (int)STRLEN(p_rtp);
+       addlen = (int)STRLEN(fname);
        new_rtp = alloc(oldlen + addlen + 2);
        if (new_rtp == NULL)
        {
@@ -3130,7 +3130,7 @@ ex_loadplugin(exarg_T *eap)
     int                len;
     char       *pat;
 
-    len = STRLEN(pattern) + STRLEN(eap->arg);
+    len = (int)STRLEN(pattern) + (int)STRLEN(eap->arg);
     pat = (char *)alloc(len);
     if (pat == NULL)
        return;

diff --git a/src/version.c b/src/version.c
index d028ca54a680ae4636ed6e63cef50d9ee5e29aa0..a476aaee5fcd4accfe4fcc83ca110fb3f03c4fb2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1396,
 /**/
     1395,
 /**/