r3696 - branches/2.0/varnish-cache/bin/varnishd

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-02-09 13:10:36 +0100 (Mon, 09 Feb 2009)
New Revision: 3696

Modified:
   branches/2.0/varnish-cache/bin/varnishd/hash_slinger.h
Log:
Merge r3506: don't overload the waiting list (yet), I suspect it causes #414b



Modified: branches/2.0/varnish-cache/bin/varnishd/hash_slinger.h
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/hash_slinger.h	2009-02-09 12:06:18 UTC (rev 3695)
+++ branches/2.0/varnish-cache/bin/varnishd/hash_slinger.h	2009-02-09 12:10:36 UTC (rev 3696)
@@ -78,12 +78,17 @@
 	char			*hash;
 	unsigned		hashlen;
 	unsigned char		digest[DIGEST_LEN];
+#ifdef NOT_YET
 	union {
 		VTAILQ_HEAD(, sess)	__u_waitinglist;
 		VTAILQ_ENTRY(objhead)	__u_coollist;
 	} __u;
 #define waitinglist __u.__u_waitinglist
 #define coollist __u.__u_coollist
+#else
+	VTAILQ_HEAD(, sess)	waitinglist;
+	VTAILQ_ENTRY(objhead)	coollist;
+#endif
 
 	/*----------------------------------------------------
 	 * The fields below are for the sole private use of