[Glibc-bsd-commits] r2083 - in trunk/libbsd: . include/bsd

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2007-12-18 14:20:20 +0000 (Tue, 18 Dec 2007)
New Revision: 2083

Modified:
   trunk/libbsd/ChangeLog
   trunk/libbsd/include/bsd/queue.h
Log:
* include/bsd/queue.h: sync with current glibc variant on GNU/kFreeBSD



Modified: trunk/libbsd/ChangeLog
===================================================================
--- trunk/libbsd/ChangeLog	2007-12-12 08:49:59 UTC (rev 2082)
+++ trunk/libbsd/ChangeLog	2007-12-18 14:20:20 UTC (rev 2083)
@@ -1,3 +1,7 @@
+2007-12-18  Petr Salinger  <Petr.Salinger at seznam.cz>
+
+	* include/bsd/queue.h: sync with current glibc variant on GNU/kFreeBSD
+
 2006-11-08  Aurelien Jarno  <aurelien at aurel32.net>
 
 	* src/link_addr.c: New file.

Modified: trunk/libbsd/include/bsd/queue.h
===================================================================
--- trunk/libbsd/include/bsd/queue.h	2007-12-12 08:49:59 UTC (rev 2082)
+++ trunk/libbsd/include/bsd/queue.h	2007-12-18 14:20:20 UTC (rev 2083)
@@ -274,7 +274,7 @@
 #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 @@
 		(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)