Mailing List Archive

Author: des
Date: 2007-02-20 09:46:53 +0100 (Tue, 20 Feb 2007)
New Revision: 1254

Modified:
branches/1.0/
branches/1.0/bin/varnishd/heritage.h
branches/1.0/bin/varnishd/varnishd.c
Log:
r34130 at cat (orig r1234): phk | 2007-01-22 12:15:27 +0100
Make params volatile so changes are discovered.




Property changes on: branches/1.0
___________________________________________________________________
Name: svk:merge
- d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1233
+ d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1234

Modified: branches/1.0/bin/varnishd/heritage.h
===================================================================
--- branches/1.0/bin/varnishd/heritage.h 2007-02-20 08:46:52 UTC (rev 1253)
+++ branches/1.0/bin/varnishd/heritage.h 2007-02-20 08:46:53 UTC (rev 1254)
@@ -104,7 +104,7 @@
unsigned client_http11;
};

-extern struct params *params;
+extern volatile struct params *params;
extern struct heritage heritage;

void child_main(void);

Modified: branches/1.0/bin/varnishd/varnishd.c
===================================================================
--- branches/1.0/bin/varnishd/varnishd.c 2007-02-20 08:46:52 UTC (rev 1253)
+++ branches/1.0/bin/varnishd/varnishd.c 2007-02-20 08:46:53 UTC (rev 1254)
@@ -60,7 +60,7 @@
#endif

struct heritage heritage;
-struct params *params;
+volatile struct params *params;

/*--------------------------------------------------------------------*/