r4101 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2009-06-10 11:20:20 +0200 (Wed, 10 Jun 2009)
New Revision: 4101

Modified:
   trunk/varnish-cache/bin/varnishd/heritage.h
   trunk/varnish-cache/bin/varnishd/mgt.h
   trunk/varnish-cache/bin/varnishd/mgt_child.c
   trunk/varnish-cache/bin/varnishd/mgt_cli.c
   trunk/varnish-cache/bin/varnishd/mgt_vcc.c
Log:
Include <vqueue.h> in <mgt.h> once and for all.



Modified: trunk/varnish-cache/bin/varnishd/heritage.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/heritage.h	2009-06-09 10:41:38 UTC (rev 4100)
+++ trunk/varnish-cache/bin/varnishd/heritage.h	2009-06-10 09:20:20 UTC (rev 4101)
@@ -33,8 +33,6 @@
 
 #include <pthread.h>
 
-#include "vqueue.h"
-
 struct listen_sock {
 	VTAILQ_ENTRY(listen_sock)	list;
 	int				sock;

Modified: trunk/varnish-cache/bin/varnishd/mgt.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt.h	2009-06-09 10:41:38 UTC (rev 4100)
+++ trunk/varnish-cache/bin/varnishd/mgt.h	2009-06-10 09:20:20 UTC (rev 4101)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include <vqueue.h>
+
 #include "common.h"
 #include "miniobj.h"
 

Modified: trunk/varnish-cache/bin/varnishd/mgt_child.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_child.c	2009-06-09 10:41:38 UTC (rev 4100)
+++ trunk/varnish-cache/bin/varnishd/mgt_child.c	2009-06-10 09:20:20 UTC (rev 4101)
@@ -54,8 +54,8 @@
 #include <sys/prctl.h>
 #endif
 
+#include "mgt.h"
 #include "heritage.h"
-#include "mgt.h"
 #include "cli.h"
 #include "cli_priv.h"
 #include "mgt_cli.h"

Modified: trunk/varnish-cache/bin/varnishd/mgt_cli.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_cli.c	2009-06-09 10:41:38 UTC (rev 4100)
+++ trunk/varnish-cache/bin/varnishd/mgt_cli.c	2009-06-10 09:20:20 UTC (rev 4101)
@@ -58,16 +58,17 @@
 #include "cli.h"
 #include "vsb.h"
 #include "cli_common.h"
-#include "heritage.h"
-#include "mgt.h"
-#include "mgt_cli.h"
 #include "vev.h"
 #include "vsha256.h"
 #include "shmlog.h"
-
 #include "vlu.h"
 #include "vss.h"
 
+
+#include "mgt.h"
+#include "heritage.h"
+#include "mgt_cli.h"
+
 static int		cli_i = -1, cli_o = -1;
 static const char	*secret_file;
 

Modified: trunk/varnish-cache/bin/varnishd/mgt_vcc.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_vcc.c	2009-06-09 10:41:38 UTC (rev 4100)
+++ trunk/varnish-cache/bin/varnishd/mgt_vcc.c	2009-06-10 09:20:20 UTC (rev 4101)
@@ -49,8 +49,6 @@
 #endif
 #include "vsb.h"
 
-#include "vqueue.h"
-
 #include "libvcl.h"
 #include "cli.h"
 #include "cli_priv.h"