updated for version 7.4.278

Problem:    list_remove() conflicts with function defined in Sun header file.
Solution:   Rename the function. (Richard Palo)

diff --git a/src/eval.c b/src/eval.c
index 5085b975b8b5114c6e1f99c234f77987e47a9d23..f619b5adf8e6f86b218411f0bacac43ab0ddd782 100644 (file)
--- 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;

diff --git a/src/if_lua.c b/src/if_lua.c
index 35e9106153a343ef22d72cf48108facdc9ba0852..7efd2cba651fbbe816875cb0b9e9859e1834d733 100644 (file)
--- a/src/if_lua.c
+++ b/src/if_lua.c
@@ -734,7 +734,7 @@ luaV_list_newindex (lua_State *L)
     if (li == NULL) return 0;
     if (lua_isnil(L, 3)) /* remove? */
     {
-       list_remove(l, li, li);
+       vimlist_remove(l, li, li);
        clear_tv(&li->li_tv);
        vim_free(li);
     }

diff --git a/src/if_py_both.h b/src/if_py_both.h
index b26226977c7660254c4c31e562b134392c68200d..bf5ea4cf3848cc12bd7e8b3516e916c55f6f147e 100644 (file)
--- 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;

diff --git a/src/proto/eval.pro b/src/proto/eval.pro
index 3fa265ef7480ee3083e1815e3c640167d2992543..517d9e71afaf1ab72922fea8891e311e3ddbd8db 100644 (file)
--- a/src/proto/eval.pro
+++ b/src/proto/eval.pro
@@ -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_string __ARGS((list_T *l, char_u *str, int len));
 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));
 int garbage_collect __ARGS((void));
 void set_ref_in_ht __ARGS((hashtab_T *ht, int copyID));

diff --git a/src/version.c b/src/version.c
index 4acbd9e90402f7a416c36337c6c247355edd8263..d1da15b35d0f743d6c3ee09dd78ee83ad386fa84 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    278,
 /**/
     277,
 /**/