aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

updated for version 7.4.278

Browse Source 
Problem:    list_remove() conflicts with function defined in Sun header file.
Solution:   Rename the function. (Richard Palo)
This commit is contained in:
Bram Moolenaar
2014-05-07 17:31:37 +02:00
parent 0d3d5e0483
commit 3ec7f4e402
5 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/eval.c
View File

@@ -5998,7 +5998,7 @@ listitem_remove(l, item)
list_T *l;
listitem_T *item;
{
list_remove(l, item, item);
vimlist_remove(l, item, item);
listitem_free(item);
}
@@ -6577,9 +6577,11 @@ list_copy(orig, deep, copyID)
/*
* Remove items "item" to "item2" from list "l".
* Does not free the listitem or the value!
* This used to be called list_remove, but that conflicts with a Sun header
* file.
*/
void
list_remove(l, item, item2)
vimlist_remove(l, item, item2)
list_T *l;
listitem_T *item;
listitem_T *item2;
@@ -15435,7 +15437,7 @@ f_remove(argvars, rettv)
if (argvars[2].v_type == VAR_UNKNOWN)
{
/* Remove one item, return its value. */
list_remove(l, item, item);
vimlist_remove(l, item, item);
*rettv = item->li_tv;
vim_free(item);
}
@@ -15461,7 +15463,7 @@ f_remove(argvars, rettv)
EMSG(_(e_invrange));
else
{
list_remove(l, item, item2);
vimlist_remove(l, item, item2);
if (rettv_list_alloc(rettv) == OK)
{
l = rettv->vval.v_list;