To: vim_dev@googlegroups.com Subject: Patch 7.4.1861 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1861 Problem: Compiler warnings with 64 bit compiler. Solution: Change int to size_t. (Mike William) Files: src/ex_cmds2.c *** ../vim-7.4.1860/src/ex_cmds2.c 2016-05-31 21:12:59.742705408 +0200 --- src/ex_cmds2.c 2016-05-31 21:33:55.494688135 +0200 *************** *** 3343,3352 **** int c; char_u *new_rtp; int keep; ! int oldlen; ! int addlen; char_u *afterdir; ! int afterlen = 0; char_u *ffname = fix_fname(fname); if (ffname == NULL) --- 3343,3352 ---- int c; char_u *new_rtp; int keep; ! size_t oldlen; ! size_t addlen; char_u *afterdir; ! size_t afterlen = 0; char_u *ffname = fix_fname(fname); if (ffname == NULL) *************** *** 3386,3394 **** 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 */ if (new_rtp == NULL) goto theend; keep = (int)(insp - p_rtp); --- 3386,3394 ---- if (afterdir != NULL && mch_isdir(afterdir)) afterlen = STRLEN(afterdir) + 1; /* add one for comma */ ! 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); *** ../vim-7.4.1860/src/version.c 2016-05-31 21:12:59.742705408 +0200 --- src/version.c 2016-05-31 21:34:50.290687381 +0200 *************** *** 755,756 **** --- 755,758 ---- { /* Add new patch number below this line */ + /**/ + 1861, /**/ -- Apparently, 1 in 5 people in the world are Chinese. And there are 5 people in my family, so it must be one of them. It's either my mum or my dad. Or my older brother Colin. Or my younger brother Ho-Cha-Chu. But I think it's Colin. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///