From c5793d47d19a07f42c5b32e1fc4672222e9af8fd Mon Sep 17 00:00:00 2001 From: Petr Salinger Date: Tue, 18 Dec 2007 14:20:20 +0000 Subject: [PATCH] bsd/queue.h: Sync with current glibc variant from GNU/kFreeBSD --- ChangeLog | 4 ++++ include/bsd/queue.h | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 648a51b..7170016 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-12-18 Petr Salinger + + * include/bsd/queue.h: sync with current glibc variant on GNU/kFreeBSD + 2006-11-08 Aurelien Jarno * src/link_addr.c: New file. diff --git a/include/bsd/queue.h b/include/bsd/queue.h index 407f08b..47e6673 100644 --- a/include/bsd/queue.h +++ b/include/bsd/queue.h @@ -274,7 +274,7 @@ struct { \ #define STAILQ_LAST(head, type, field) \ (STAILQ_EMPTY((head)) ? \ NULL : \ - ((struct type *) \ + ((struct type *)(void *) \ ((char *)((head)->stqh_last) - __offsetof(struct type, field)))) #define STAILQ_NEXT(elm, field) ((elm)->field.stqe_next) @@ -403,7 +403,7 @@ struct { \ (head2)->tqh_first->field.tqe_prev = (head1)->tqh_last; \ (head1)->tqh_last = (head2)->tqh_last; \ TAILQ_INIT((head2)); \ - QMD_TRACE_HEAD(head); \ + QMD_TRACE_HEAD(head1); \ QMD_TRACE_HEAD(head2); \ } \ } while (0)