[master] ed35f9f Cleaner scoping of waiter descriptions

[Poul-Henning Kamp]

commit ed35f9f3a203187635f1373c994c07577015333e
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Aug 14 11:17:59 2017 +0000

    Cleaner scoping of waiter descriptions

diff --git a/bin/varnishd/waiter/cache_waiter_epoll.c b/bin/varnishd/waiter/cache_waiter_epoll.c
index ffbf947..5c40597 100644
--- a/bin/varnishd/waiter/cache_waiter_epoll.c
+++ b/bin/varnishd/waiter/cache_waiter_epoll.c
@@ -219,6 +219,8 @@ vwe_fini(struct waiter *w)
 
 /*--------------------------------------------------------------------*/
 
+#include "waiter/mgt_waiter.h"
+
 const struct waiter_impl waiter_epoll = {
 	.name =		"epoll",
 	.init =		vwe_init,
diff --git a/bin/varnishd/waiter/cache_waiter_kqueue.c b/bin/varnishd/waiter/cache_waiter_kqueue.c
index e757e40..24cd446 100644
--- a/bin/varnishd/waiter/cache_waiter_kqueue.c
+++ b/bin/varnishd/waiter/cache_waiter_kqueue.c
@@ -41,7 +41,6 @@
 #include <stdlib.h>
 
 #include "waiter/waiter_priv.h"
-#include "waiter/mgt_waiter.h"
 #include "vtim.h"
 
 #define NKEV	256
@@ -202,6 +201,8 @@ vwk_fini(struct waiter *w)
 
 /*--------------------------------------------------------------------*/
 
+#include "waiter/mgt_waiter.h"
+
 const struct waiter_impl waiter_kqueue = {
 	.name =		"kqueue",
 	.init =		vwk_init,
diff --git a/bin/varnishd/waiter/cache_waiter_poll.c b/bin/varnishd/waiter/cache_waiter_poll.c
index 7d84c03..4b3ffc4 100644
--- a/bin/varnishd/waiter/cache_waiter_poll.c
+++ b/bin/varnishd/waiter/cache_waiter_poll.c
@@ -269,6 +269,8 @@ vwp_fini(struct waiter *w)
 
 /*--------------------------------------------------------------------*/
 
+#include "waiter/mgt_waiter.h"
+
 const struct waiter_impl waiter_poll = {
 	.name =		"poll",
 	.init =		vwp_init,