0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

updated for version 7.4.278

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

View File

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