[Glibc-bsd-commits] r5091 - in trunk/freebsd-glue: debian include/sys

[Robert Millan]

Author: rmh
Date: 2013-10-26 14:09:20 +0000 (Sat, 26 Oct 2013)
New Revision: 5091

Modified:
   trunk/freebsd-glue/debian/changelog
   trunk/freebsd-glue/include/sys/queue.h
Log:
Work around broken macro argument in TAILQ_FOREACH_REVERSE_SAFE

Modified: trunk/freebsd-glue/debian/changelog
===================================================================
--- trunk/freebsd-glue/debian/changelog	2013-10-26 14:08:31 UTC (rev 5090)
+++ trunk/freebsd-glue/debian/changelog	2013-10-26 14:09:20 UTC (rev 5091)
@@ -3,6 +3,7 @@
   * Fix improper allocation in funopen(). (Closes: #726970)
   * Add _PATH_UFSSUSPEND.
   * Add arc4random_stir() prototype (for libbsd).
+  * Work around broken macro argument in TAILQ_FOREACH_REVERSE_SAFE
 
  -- Robert Millan <rmh at debian.org>  Sat, 26 Oct 2013 00:27:03 +0200
 

Modified: trunk/freebsd-glue/include/sys/queue.h
===================================================================
--- trunk/freebsd-glue/include/sys/queue.h	2013-10-26 14:08:31 UTC (rev 5090)
+++ trunk/freebsd-glue/include/sys/queue.h	2013-10-26 14:09:20 UTC (rev 5091)
@@ -81,11 +81,13 @@
 	    (var) = (tvar))
 #endif
 
-#ifndef TAILQ_FOREACH_REVERSE_SAFE
+#endif
+
+
+#ifdef TAILQ_FOREACH_REVERSE_SAFE
+#undef TAILQ_FOREACH_REVERSE_SAFE
 #define	TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
 	for ((var) = (*(((struct headname *)((head)->tqh_last))->tqh_last));	\
-	    (var) && ((tvar) = (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last)), 1);	\
+	    (var) && ((tvar) = (*(((struct headname *)((var)->field.tqe_prev))->tqh_last)), 1);	\
 	    (var) = (tvar))
 #endif
-
-#endif