Compilation fix for more recent GCC compiler

This commit is contained in:
Michele Bini 2013-09-30 08:50:06 +02:00
parent 60d2333113
commit 75e218b7f2
2 changed files with 4 additions and 4 deletions

View File

@ -658,7 +658,7 @@ void igw_order(inet_gw **igws, int *igws_counter, inet_gw **my_igws, int level)
if(!igws_counter[level] || !igws[level]) if(!igws_counter[level] || !igws[level])
return; return;
new_head=clist_qsort(igws[level], igws_counter[level], igw_cmp); clist_qsort(new_head, igws[level], igws_counter[level], igw_cmp);
igw=new_head; igw=new_head;
list_for(igw) { list_for(igw) {

View File

@ -606,9 +606,9 @@ do{ \
* should be aware of this. * should be aware of this.
* - it follows the new order of `tmp' and appends each array element in * - it follows the new order of `tmp' and appends each array element in
* a new llist. * a new llist.
* - the head of the new llist is returned. * - the head of the new llist is assigned to _new_head
*/ */
#define clist_qsort(_head, _counter, _cmp_func) \ #define clist_qsort(_new_head, _head, _counter, _cmp_func) \
({ \ ({ \
l_list *_hcq=(l_list *)(_head), *_ncq, *_hecq, *_tcq; \ l_list *_hcq=(l_list *)(_head), *_ncq, *_hecq, *_tcq; \
int _icq=0, _ccq; \ int _icq=0, _ccq; \
@ -629,7 +629,7 @@ do{ \
for(_icq=0; _icq<_ccq; _icq++) \ for(_icq=0; _icq<_ccq; _icq++) \
_tcq=(l_list *)list_append(0, _tcq, _tmp_list[_icq]); \ _tcq=(l_list *)list_append(0, _tcq, _tmp_list[_icq]); \
\ \
(typeof((_head)))_hecq; \ _new_head = (typeof((_head)))_hecq; \
}) \ }) \
#endif /*LLIST_C*/ #endif /*LLIST_C*/