From 31cdefc7cb7f93583ac3884500302f7c447a0921 Mon Sep 17 00:00:00 2001
From: des <des@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Tue, 4 Apr 2006 10:09:37 +0000
Subject: [PATCH] More portability changes: include config.h and compat.h, get
 rid of __unused.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@116 d4fa192b-c00b-0410-8231-f00ffab90ce4
---
 varnish-cache/bin/varnishd/cache_acceptor.c |  2 ++
 varnish-cache/bin/varnishd/cache_backend.c  | 15 ++++++++-------
 varnish-cache/bin/varnishd/cache_main.c     |  6 ++++--
 varnish-cache/bin/varnishd/cache_pool.c     |  4 +++-
 varnish-cache/bin/varnishd/mgt_child.c      |  2 +-
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/varnish-cache/bin/varnishd/cache_acceptor.c b/varnish-cache/bin/varnishd/cache_acceptor.c
index b6857322..f5615e17 100644
--- a/varnish-cache/bin/varnishd/cache_acceptor.c
+++ b/varnish-cache/bin/varnishd/cache_acceptor.c
@@ -16,6 +16,8 @@
 #include <sbuf.h>
 #include <event.h>
 
+#include "config.h"
+#include "compat.h"
 #include "libvarnish.h"
 #include "vcl_lang.h"
 #include "heritage.h"
diff --git a/varnish-cache/bin/varnishd/cache_backend.c b/varnish-cache/bin/varnishd/cache_backend.c
index 432cbbd9..5bf8e6cf 100644
--- a/varnish-cache/bin/varnishd/cache_backend.c
+++ b/varnish-cache/bin/varnishd/cache_backend.c
@@ -2,17 +2,18 @@
  * $Id$
  */
 
-#include <assert.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <pthread.h>
-#include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+
+#include <assert.h>
 #include <netdb.h>
+#include <pthread.h>
+#include <queue.h>
 #include <sbuf.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "libvarnish.h"
 #include "vcl_lang.h"
diff --git a/varnish-cache/bin/varnishd/cache_main.c b/varnish-cache/bin/varnishd/cache_main.c
index 15869c70..b9680604 100644
--- a/varnish-cache/bin/varnishd/cache_main.c
+++ b/varnish-cache/bin/varnishd/cache_main.c
@@ -53,9 +53,10 @@ arm_keepalive(void)
 /*--------------------------------------------------------------------*/
 
 static void
-cli_func_url_query(struct cli *cli, char **av, void *priv __unused)
+cli_func_url_query(struct cli *cli, char **av, void *priv)
 {
 
+	(void)priv;
 	cli_out(cli, "url <%s>", av[2]);
 	cli_result(cli, CLIS_UNIMPL);
 }
@@ -63,10 +64,11 @@ cli_func_url_query(struct cli *cli, char **av, void *priv __unused)
 /*--------------------------------------------------------------------*/
 
 static void
-cli_func_ping(struct cli *cli, char **av, void *priv __unused)
+cli_func_ping(struct cli *cli, char **av, void *priv)
 {
 	time_t t;
 
+	(void)priv;
 	VSL(SLT_CLI, 0, av[1]);
 	arm_keepalive();
 	if (av[2] != NULL) {
diff --git a/varnish-cache/bin/varnishd/cache_pool.c b/varnish-cache/bin/varnishd/cache_pool.c
index a1c30203..d1a15939 100644
--- a/varnish-cache/bin/varnishd/cache_pool.c
+++ b/varnish-cache/bin/varnishd/cache_pool.c
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <assert.h>
 #include <pthread.h>
+#include <queue.h>
 
 #include "libvarnish.h"
 #include "vcl_lang.h"
@@ -15,10 +16,11 @@ static TAILQ_HEAD(, sess) shd = TAILQ_HEAD_INITIALIZER(shd);
 static pthread_cond_t	shdcnd;
 
 static void *
-CacheWorker(void *priv __unused)
+CacheWorker(void *priv)
 {
 	struct sess *sp;
 
+	(void)priv;
 	AZ(pthread_mutex_lock(&sessmtx));
 	while (1) {
 		while (1) {
diff --git a/varnish-cache/bin/varnishd/mgt_child.c b/varnish-cache/bin/varnishd/mgt_child.c
index e0ca92a2..012b5934 100644
--- a/varnish-cache/bin/varnishd/mgt_child.c
+++ b/varnish-cache/bin/varnishd/mgt_child.c
@@ -16,7 +16,7 @@
 #include <unistd.h>
 
 #include <sys/wait.h>
-#include <sys/queue.h>
+#include <queue.h>
 
 #include <event.h>
 #include <sbuf.h>
-- 
2.39.5