summaryrefslogtreecommitdiff
path: root/src/if_py_both.h
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-05-07 17:31:37 +0200
committerBram Moolenaar <Bram@vim.org>2014-05-07 17:31:37 +0200
commit3ec7f4e4025c5a78ccd312f8516ac0740aa65dfe (patch)
tree70b0fdafe86015644955d6247ae167fe1aa2b982 /src/if_py_both.h
parent0d3d5e0483ddad68d333284d988b4269674f71dd (diff)
downloadvim-git-3ec7f4e4025c5a78ccd312f8516ac0740aa65dfe.tar.gz
updated for version 7.4.278v7.4.278
Problem: list_remove() conflicts with function defined in Sun header file. Solution: Rename the function. (Richard Palo)
Diffstat (limited to 'src/if_py_both.h')
-rw-r--r--src/if_py_both.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h
index b26226977..bf5ea4cf3 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -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;