Mercurial > vim

diff src/if_py_both.h @ 5871:b4ce0e1fb5a6 v7.4.278

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.278 Problem: list_remove() conflicts with function defined in Sun header file. Solution: Rename the function. (Richard Palo)
author Bram Moolenaar <bram@vim.org>
date Wed, 07 May 2014 17:31:37 +0200
parents 3ee5808a293c
children 85a1802ae810
line wrap: on
line diff
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -2494,7 +2494,7 @@ ListAssSlice(ListObject *self, Py_ssize_
 	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_
     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;