diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-05-07 17:31:37 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-05-07 17:31:37 +0200 |
| commit | 3ec7f4e4025c5a78ccd312f8516ac0740aa65dfe (patch) | |
| tree | 70b0fdafe86015644955d6247ae167fe1aa2b982 /src/eval.c | |
| parent | 0d3d5e0483ddad68d333284d988b4269674f71dd (diff) | |
| download | vim-3ec7f4e4025c5a78ccd312f8516ac0740aa65dfe.zip | |
updated for version 7.4.278
Problem: list_remove() conflicts with function defined in Sun header file.
Solution: Rename the function. (Richard Palo)
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/eval.c b/src/eval.c index 5085b975b..f619b5adf 100644 --- a/src/eval.c +++ b/src/eval.c @@ -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; |