1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
|
To: vim_dev@googlegroups.com
Subject: Patch 7.4.278
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.4.278
Problem: list_remove() conflicts with function defined in Sun header file.
Solution: Rename the function. (Richard Palo)
Files: src/eval.c, src/if_lua.c, src/if_py_both.h, src/proto/eval.pro
*** ../vim-7.4.277/src/eval.c 2014-04-29 17:41:18.351689927 +0200
--- src/eval.c 2014-05-07 17:28:56.037181128 +0200
***************
*** 5998,6004 ****
list_T *l;
listitem_T *item;
{
! list_remove(l, item, item);
listitem_free(item);
}
--- 5998,6004 ----
list_T *l;
listitem_T *item;
{
! vimlist_remove(l, item, item);
listitem_free(item);
}
***************
*** 6577,6585 ****
/*
* Remove items "item" to "item2" from list "l".
* Does not free the listitem or the value!
*/
void
! list_remove(l, item, item2)
list_T *l;
listitem_T *item;
listitem_T *item2;
--- 6577,6587 ----
/*
* 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
! vimlist_remove(l, item, item2)
list_T *l;
listitem_T *item;
listitem_T *item2;
***************
*** 15435,15441 ****
if (argvars[2].v_type == VAR_UNKNOWN)
{
/* Remove one item, return its value. */
! list_remove(l, item, item);
*rettv = item->li_tv;
vim_free(item);
}
--- 15437,15443 ----
if (argvars[2].v_type == VAR_UNKNOWN)
{
/* Remove one item, return its value. */
! vimlist_remove(l, item, item);
*rettv = item->li_tv;
vim_free(item);
}
***************
*** 15461,15467 ****
EMSG(_(e_invrange));
else
{
! list_remove(l, item, item2);
if (rettv_list_alloc(rettv) == OK)
{
l = rettv->vval.v_list;
--- 15463,15469 ----
EMSG(_(e_invrange));
else
{
! vimlist_remove(l, item, item2);
if (rettv_list_alloc(rettv) == OK)
{
l = rettv->vval.v_list;
*** ../vim-7.4.277/src/if_lua.c 2013-06-23 12:55:02.000000000 +0200
--- src/if_lua.c 2014-05-07 17:29:08.913181240 +0200
***************
*** 734,740 ****
if (li == NULL) return 0;
if (lua_isnil(L, 3)) /* remove? */
{
! list_remove(l, li, li);
clear_tv(&li->li_tv);
vim_free(li);
}
--- 734,740 ----
if (li == NULL) return 0;
if (lua_isnil(L, 3)) /* remove? */
{
! vimlist_remove(l, li, li);
clear_tv(&li->li_tv);
vim_free(li);
}
*** ../vim-7.4.277/src/if_py_both.h 2014-03-30 16:11:37.176530823 +0200
--- src/if_py_both.h 2014-05-07 17:29:26.497181394 +0200
***************
*** 2494,2500 ****
if (numreplaced < slicelen)
{
lis[slicelen + numreplaced] = lis[numreplaced]->li_prev;
! list_remove(l, lis[numreplaced], lis[numreplaced]);
numreplaced++;
}
else
--- 2494,2500 ----
if (numreplaced < slicelen)
{
lis[slicelen + numreplaced] = lis[numreplaced]->li_prev;
! vimlist_remove(l, lis[numreplaced], lis[numreplaced]);
numreplaced++;
}
else
***************
*** 2570,2576 ****
if (obj == NULL)
{
li = list_find(l, (long) index);
! list_remove(l, li, li);
clear_tv(&li->li_tv);
vim_free(li);
return 0;
--- 2570,2576 ----
if (obj == NULL)
{
li = list_find(l, (long) index);
! vimlist_remove(l, li, li);
clear_tv(&li->li_tv);
vim_free(li);
return 0;
*** ../vim-7.4.277/src/proto/eval.pro 2014-01-14 16:36:40.000000000 +0100
--- src/proto/eval.pro 2014-05-07 17:30:02.517181710 +0200
***************
*** 59,65 ****
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 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));
--- 59,65 ----
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 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));
*** ../vim-7.4.277/src/version.c 2014-05-07 16:35:05.029152844 +0200
--- src/version.c 2014-05-07 17:30:43.449182068 +0200
***************
*** 736,737 ****
--- 736,739 ----
{ /* Add new patch number below this line */
+ /**/
+ 278,
/**/
--
"Computers in the future may weigh no more than 1.5 tons."
Popular Mechanics, 1949
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
