# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1464723905 -7200
# Node ID e4d7e6d1a0f1d6cd97804174b3ddf9af488101c1
# Parent  da5cc3ccf4793d6b049d46417d36bd981b76872b
commit https://github.com/vim/vim/commit/b055066a1daf12c349d6c575aff22ae4d999a157
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue May 31 21:37:36 2016 +0200

    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
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -3343,10 +3343,10 @@ add_pack_plugin(char_u *fname, void *coo
     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 *coo
 	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
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1861,
+/**/
     1860,
 /**/
     1859,