[master] 330cd26 Concentrate waiter stuff in waiter includes

[Poul-Henning Kamp]

commit 330cd262e4d434bb87947fca44872b798bcc431a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue May 26 08:40:25 2015 +0000

    Concentrate waiter stuff in waiter includes

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 1a0dc03..ba45bf2 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -41,6 +41,8 @@
 #include "vapi/vsl_int.h"
 #include "vapi/vsm_int.h"
 
+#include "waiter/waiter.h"
+
 #include <sys/socket.h>
 
 #include <pthread.h>
@@ -366,19 +368,6 @@ struct lru {
 	unsigned		n_objcore;
 };
 
-/* Connection waiter -------------------------------------------------
- * Describing a file-descriptor/connection being waited on
- */
-
-struct waited {
-	unsigned		magic;
-#define WAITED_MAGIC		0x1743992d
-	int			fd;
-	void			*ptr;
-	double			idle;
-	VTAILQ_ENTRY(waited)	list;
-};
-
 /* Stored object -----------------------------------------------------
  * Pointer to a stored object, and the methods it supports
  */
diff --git a/bin/varnishd/cache/cache_backend_tcp.c b/bin/varnishd/cache/cache_backend_tcp.c
index 44b6351..16b989e 100644
--- a/bin/varnishd/cache/cache_backend_tcp.c
+++ b/bin/varnishd/cache/cache_backend_tcp.c
@@ -41,7 +41,6 @@
 #include "cache_backend.h"
 #include "vtcp.h"
 #include "vsa.h"
-#include "waiter/waiter.h"
 #include "vtim.h"
 
 struct tcp_pool {
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index ee1091c..6f59a5e 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -47,7 +47,6 @@
 #include "storage/storage.h"
 #include "vcl.h"
 #include "vcli_priv.h"
-#include "waiter/waiter.h"
 
 /*
  * The panic string is constructed in memory, then copied to the
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 37a6109..950023c 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -47,7 +47,6 @@
 
 #include "cache.h"
 
-#include "waiter/waiter.h"
 #include "vsa.h"
 #include "vtcp.h"
 #include "vtim.h"
diff --git a/bin/varnishd/waiter/cache_waiter.c b/bin/varnishd/waiter/cache_waiter.c
index 5965c8a..5e76eb0 100644
--- a/bin/varnishd/waiter/cache_waiter.c
+++ b/bin/varnishd/waiter/cache_waiter.c
@@ -36,7 +36,6 @@
 
 #include "cache/cache.h"
 
-#include "waiter/waiter.h"
 #include "waiter/waiter_priv.h"
 #include "waiter/mgt_waiter.h"
 
diff --git a/bin/varnishd/waiter/cache_waiter_epoll.c b/bin/varnishd/waiter/cache_waiter_epoll.c
index 01f568c..9302add 100644
--- a/bin/varnishd/waiter/cache_waiter_epoll.c
+++ b/bin/varnishd/waiter/cache_waiter_epoll.c
@@ -41,7 +41,6 @@
 
 #include "cache/cache.h"
 
-#include "waiter/waiter.h"
 #include "waiter/waiter_priv.h"
 #include "waiter/mgt_waiter.h"
 #include "vtim.h"
diff --git a/bin/varnishd/waiter/cache_waiter_kqueue.c b/bin/varnishd/waiter/cache_waiter_kqueue.c
index b52ded0..6c55ac9 100644
--- a/bin/varnishd/waiter/cache_waiter_kqueue.c
+++ b/bin/varnishd/waiter/cache_waiter_kqueue.c
@@ -40,7 +40,6 @@
 
 #include "cache/cache.h"
 
-#include "waiter/waiter.h"
 #include "waiter/waiter_priv.h"
 #include "waiter/mgt_waiter.h"
 #include "vtim.h"
diff --git a/bin/varnishd/waiter/cache_waiter_poll.c b/bin/varnishd/waiter/cache_waiter_poll.c
index 210cd78..fba970b 100644
--- a/bin/varnishd/waiter/cache_waiter_poll.c
+++ b/bin/varnishd/waiter/cache_waiter_poll.c
@@ -36,7 +36,6 @@
 
 #include "cache/cache.h"
 
-#include "waiter/waiter.h"
 #include "waiter/waiter_priv.h"
 #include "waiter/mgt_waiter.h"
 #include "vtim.h"
diff --git a/bin/varnishd/waiter/cache_waiter_ports.c b/bin/varnishd/waiter/cache_waiter_ports.c
index eb3ad4a..d02f302 100644
--- a/bin/varnishd/waiter/cache_waiter_ports.c
+++ b/bin/varnishd/waiter/cache_waiter_ports.c
@@ -43,7 +43,6 @@
 
 #include "cache/cache.h"
 
-#include "waiter/waiter.h"
 #include "waiter/waiter_priv.h"
 #include "waiter/mgt_waiter.h"
 #include "vtim.h"
diff --git a/bin/varnishd/waiter/waiter.h b/bin/varnishd/waiter/waiter.h
index c211fd6..500b36a 100644
--- a/bin/varnishd/waiter/waiter.h
+++ b/bin/varnishd/waiter/waiter.h
@@ -42,9 +42,21 @@
  * Public interfaces
  */
 
-struct waited;
 struct waiter;
 
+/* Connection waiter -------------------------------------------------
+ * Describing a file-descriptor/connection being waited on
+ */
+
+struct waited {
+	unsigned		magic;
+#define WAITED_MAGIC		0x1743992d
+	int			fd;
+	void			*ptr;
+	double			idle;
+	VTAILQ_ENTRY(waited)	list;
+};
+
 enum wait_event {
 	WAITER_REMCLOSE,
 	WAITER_TIMEOUT,