bsd/queue.h: Sync with current glibc variant from GNU/kFreeBSD

diff --git a/ChangeLog b/ChangeLog
index 648a51b6c94ad272d80446ffd6e3aa49a65cef99..7170016277f0a0e4ac9672284ac221b4bf667366 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-18  Petr Salinger  <Petr.Salinger@seznam.cz>
+
+       * include/bsd/queue.h: sync with current glibc variant on GNU/kFreeBSD
+
 2006-11-08  Aurelien Jarno  <aurelien@aurel32.net>
 
        * src/link_addr.c: New file.

diff --git a/include/bsd/queue.h b/include/bsd/queue.h
index 407f08bc8c7c4e45371810017331c8fbab3c0171..47e667384e6ca98c4d72e45f96f86c8664feea32 100644 (file)
--- 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)