aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-25 10:54:51 -04:00
Code

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

2
src/if_lua.c
View File

@ -734,7 +734,7 @@ luaV_list_newindex (lua_State *L)
if (li == NULL) return 0; if (li == NULL) return 0;
if (lua_isnil(L, 3)) /* remove? */ if (lua_isnil(L, 3)) /* remove? */
{ {
list_remove(l, li, li); vimlist_remove(l, li, li);
clear_tv(&li->li_tv); clear_tv(&li->li_tv);
vim_free(li); vim_free(li);
} }

4
src/if_py_both.h
View File

@ -2494,7 +2494,7 @@ ListAssSlice(ListObject *self, Py_ssize_t first,
if (numreplaced < slicelen) if (numreplaced < slicelen)
{ {
lis[slicelen + numreplaced] = lis[numreplaced]->li_prev; lis[slicelen + numreplaced] = lis[numreplaced]->li_prev;
list_remove(l, lis[numreplaced], lis[numreplaced]); vimlist_remove(l, lis[numreplaced], lis[numreplaced]);
numreplaced++; numreplaced++;
} }
else else
@ -2570,7 +2570,7 @@ ListAssIndex(ListObject *self, Py_ssize_t index, PyObject *obj)
if (obj == NULL) if (obj == NULL)
{ {
li = list_find(l, (long) index); li = list_find(l, (long) index);
list_remove(l, li, li); vimlist_remove(l, li, li);
clear_tv(&li->li_tv); clear_tv(&li->li_tv);
vim_free(li); vim_free(li);
return 0; return 0;

2
src/proto/eval.pro
View File

@ -59,7 +59,7 @@ int list_append_tv __ARGS((list_T *l, typval_T *tv));
int list_append_dict __ARGS((list_T *list, dict_T *dict)); int list_append_dict __ARGS((list_T *list, dict_T *dict));
int list_append_string __ARGS((list_T *l, char_u *str, int len)); int list_append_string __ARGS((list_T *l, char_u *str, int len));
int list_insert_tv __ARGS((list_T *l, typval_T *tv, listitem_T *item)); int list_insert_tv __ARGS((list_T *l, typval_T *tv, listitem_T *item));
void list_remove __ARGS((list_T *l, listitem_T *item, listitem_T *item2)); void vimlist_remove __ARGS((list_T *l, listitem_T *item, listitem_T *item2));
void list_insert __ARGS((list_T *l, listitem_T *ni, listitem_T *item)); void list_insert __ARGS((list_T *l, listitem_T *ni, listitem_T *item));
int garbage_collect __ARGS((void)); int garbage_collect __ARGS((void));
void set_ref_in_ht __ARGS((hashtab_T *ht, int copyID)); void set_ref_in_ht __ARGS((hashtab_T *ht, int copyID));

2
src/version.c
View File

@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
278,
/**/ /**/
277, 277,
/**/ /**/