[4.1] d5a3959 Current SmartOS also has epoll(), so we need to prefer ports ...

[PÃ¥l Hermunn Johansen]

commit d5a3959d9f8323deb466df5cf1fba2eeb41c9a8a
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue May 31 16:05:29 2016 +0200

    Current SmartOS also has epoll(), so we need to prefer ports ...
    
    ... in order to actually use it by default

diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index dab70fb..18656dc 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -248,12 +248,12 @@ usage(void)
 #if defined(HAVE_KQUEUE)
 	fprintf(stderr, FMT, "", "  -W kqueue");
 #endif
-#if defined(HAVE_EPOLL_CTL)
-	fprintf(stderr, FMT, "", "  -W epoll");
-#endif
 #if defined(HAVE_PORT_CREATE)
 	fprintf(stderr, FMT, "", "  -W ports");
 #endif
+#if defined(HAVE_EPOLL_CTL)
+	fprintf(stderr, FMT, "", "  -W epoll");
+#endif
 	fprintf(stderr, FMT, "", "  -W poll");
 
 #undef FMT
diff --git a/bin/varnishd/waiter/mgt_waiter.c b/bin/varnishd/waiter/mgt_waiter.c
index c0e450d..58d4307 100644
--- a/bin/varnishd/waiter/mgt_waiter.c
+++ b/bin/varnishd/waiter/mgt_waiter.c
@@ -40,12 +40,12 @@ static const struct choice waiter_choice[] = {
     #if defined(HAVE_KQUEUE)
 	{ "kqueue",	&waiter_kqueue },
     #endif
-    #if defined(HAVE_EPOLL_CTL)
-	{ "epoll",	&waiter_epoll },
-    #endif
     #if defined(HAVE_PORT_CREATE)
 	{ "ports",	&waiter_ports },
     #endif
+    #if defined(HAVE_EPOLL_CTL)
+	{ "epoll",	&waiter_epoll },
+    #endif
 	{ "poll",	&waiter_poll },
 	{ NULL,		NULL}
 };