[Glibc-bsd-commits] r2493 - trunk/ufsutils/debian/patches

[Petr Salinger]

Author: ps-guest
Date: 2009-05-04 14:19:27 +0000 (Mon, 04 May 2009)
New Revision: 2493

Modified:
   trunk/ufsutils/debian/patches/02_fsck.ufs.patch
Log:
workaround broken macro LIST_FOREACH_SAFE in our glibc



Modified: trunk/ufsutils/debian/patches/02_fsck.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_fsck.ufs.patch	2009-05-04 12:58:21 UTC (rev 2492)
+++ trunk/ufsutils/debian/patches/02_fsck.ufs.patch	2009-05-04 14:19:27 UTC (rev 2493)
@@ -12,7 +12,27 @@
  #include <sys/param.h>
  #include <sys/disklabel.h>
  #include <sys/mount.h>
-@@ -774,3 +777,4 @@
+@@ -73,6 +76,19 @@
+ 
+ #include "fsck.h"
+ 
++
++/*
++   the glibc variant is broken,
++   it have one extra "("
++   workaround it here
++ */
++#undef LIST_FOREACH_SAFE
++#define	LIST_FOREACH_SAFE(var, head, field, tvar)			\
++	for ((var) = ((head)->lh_first);				\
++	    (var) && ((tvar) = ((var)->field.le_next), 1);		\
++	    (var) = (tvar))
++
++
+ struct cgchain {
+ 	union {
+ 		struct cg cgcu_cg;
+@@ -774,3 +790,4 @@
  	/* Write back updated statistics and super-block. */
  	putdisk();
  }