[master] a36ad63 Move the cache_waiter stuff from cache.h to waiter.h

[Poul-Henning Kamp]

commit a36ad636d5f614c6f361541e4f39cd092a9f9a75
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Jan 12 09:10:57 2015 +0000

    Move the cache_waiter stuff from cache.h to waiter.h

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index e32f780..0f64145 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -1063,12 +1063,6 @@ void ESI_DeliverChild(struct req *, struct busyobj *);
 /* cache_vrt_vmod.c */
 void VMOD_Init(void);
 
-/* cache_waiter.c */
-void WAIT_Enter(struct sess *sp);
-void WAIT_Init(void);
-const char *WAIT_GetName(void);
-void WAIT_Write_Session(struct sess *sp, int fd);
-
 /* cache_wrk.c */
 
 void WRK_Thread(struct pool *qp, size_t stacksize, unsigned thread_workspace);
diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index a062a48..14dcf9f 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -503,7 +503,7 @@ vbe_dir_http1pipe(const struct director *d, struct req *req, struct busyobj *bo)
 
 void
 VRT_init_vbe(VRT_CTX, struct director **bp, int idx,
-    const struct vrt_backend *t) 
+    const struct vrt_backend *t)
 {
 	struct vbe_dir *vs;
 
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index d45458e..028f75c 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -47,6 +47,7 @@
 #include "cache_backend.h"
 #include "storage/storage.h"
 #include "vcl.h"
+#include "waiter/waiter.h"
 
 /*
  * The panic string is constructed in memory, then copied to the
diff --git a/bin/varnishd/http1/cache_http1_fsm.c b/bin/varnishd/http1/cache_http1_fsm.c
index 62cfcf1..1f663ec 100644
--- a/bin/varnishd/http1/cache_http1_fsm.c
+++ b/bin/varnishd/http1/cache_http1_fsm.c
@@ -44,6 +44,7 @@
 #include "vcl.h"
 #include "vtcp.h"
 #include "vtim.h"
+#include "waiter/waiter.h"
 
 /*----------------------------------------------------------------------
  * Collect a request from the client.
diff --git a/bin/varnishd/waiter/waiter.h b/bin/varnishd/waiter/waiter.h
index 5e8e56b..410aa02 100644
--- a/bin/varnishd/waiter/waiter.h
+++ b/bin/varnishd/waiter/waiter.h
@@ -41,6 +41,12 @@ struct waiter {
 	waiter_pass_f		*pass;
 };
 
+/* cache_waiter.c */
+void WAIT_Enter(struct sess *sp);
+void WAIT_Init(void);
+const char *WAIT_GetName(void);
+void WAIT_Write_Session(struct sess *sp, int fd);
+
 /* mgt_waiter.c */
 extern struct waiter const * waiter;
 int WAIT_tweak_waiter(struct vsb *vsb, const char *arg);