[master] 6570945 Isolate VAV from libvarnish.h

[Poul-Henning Kamp]

commit 6570945671d2ab43b3ced048a31df7133d45c1dc
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun Oct 9 18:06:29 2011 +0000

    Isolate VAV from libvarnish.h

diff --git a/bin/varnishd/cache_hash.c b/bin/varnishd/cache_hash.c
index 7e45b8a..4001c7c 100644
--- a/bin/varnishd/cache_hash.c
+++ b/bin/varnishd/cache_hash.c
@@ -61,6 +61,7 @@
 #include "stevedore.h"
 #include "hash_slinger.h"
 #include "vsha256.h"
+#include "vav.h"
 #include "cache_backend.h"
 
 static const struct hash_slinger *hash;
diff --git a/bin/varnishd/cache_vrt.c b/bin/varnishd/cache_vrt.c
index f0407cc..a53799e 100644
--- a/bin/varnishd/cache_vrt.c
+++ b/bin/varnishd/cache_vrt.c
@@ -41,6 +41,7 @@
 
 #include "vrt.h"
 #include "vrt_obj.h"
+#include "vav.h"
 #include "vcl.h"
 #include "hash_slinger.h"
 #include "cache_backend.h"
diff --git a/bin/varnishd/mgt_param.c b/bin/varnishd/mgt_param.c
index 7138369..f849fbb 100644
--- a/bin/varnishd/mgt_param.c
+++ b/bin/varnishd/mgt_param.c
@@ -47,6 +47,7 @@
 #include "vparam.h"
 #include "cache_waiter.h"
 
+#include "vav.h"
 #include "vss.h"
 
 #define MAGIC_INIT_STRING	"\001"
diff --git a/bin/varnishd/mgt_shmem.c b/bin/varnishd/mgt_shmem.c
index 5b717b0..38dc59a 100644
--- a/bin/varnishd/mgt_shmem.c
+++ b/bin/varnishd/mgt_shmem.c
@@ -102,6 +102,7 @@
 #include "heritage.h"
 #include "vmb.h"
 #include "vsm.h"
+#include "vav.h"
 #include "flopen.h"
 
 #ifndef MAP_HASSEMAPHORE
diff --git a/bin/varnishd/stevedore.c b/bin/varnishd/stevedore.c
index 143e534..6d71635 100644
--- a/bin/varnishd/stevedore.c
+++ b/bin/varnishd/stevedore.c
@@ -38,6 +38,7 @@
 
 #include "cache.h"
 #include "stevedore.h"
+#include "vav.h"
 #include "cli_priv.h"
 #include "vrt_obj.h"
 
diff --git a/bin/varnishd/varnishd.c b/bin/varnishd/varnishd.c
index 0219eb0..2d7db59 100644
--- a/bin/varnishd/varnishd.c
+++ b/bin/varnishd/varnishd.c
@@ -53,6 +53,7 @@
 #include "vcli.h"
 #include "cli_common.h"
 
+#include "vav.h"
 #include "vin.h"
 #include "heritage.h"
 #include "mgt.h"
diff --git a/bin/varnishtest/vtc.c b/bin/varnishtest/vtc.c
index 506aee1..e31eaca 100644
--- a/bin/varnishtest/vtc.c
+++ b/bin/varnishtest/vtc.c
@@ -39,6 +39,7 @@
 
 #include "vtc.h"
 
+#include "vav.h"
 #include "libvarnish.h"
 
 
diff --git a/include/libvarnish.h b/include/libvarnish.h
index 6008781..a40aa20 100644
--- a/include/libvarnish.h
+++ b/include/libvarnish.h
@@ -38,8 +38,6 @@
 
 struct vsb;
 
-#include "vav.h"
-
 /* from libvarnish/num.c */
 const char *str2bytes(const char *p, uintmax_t *r, uintmax_t rel);
 
diff --git a/lib/libvarnish/argv.c b/lib/libvarnish/argv.c
index ad088cd..a0c57bb 100644
--- a/lib/libvarnish/argv.c
+++ b/lib/libvarnish/argv.c
@@ -43,7 +43,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "libvarnish.h"
+#include "vas.h"
+#include "vav.h"
 
 int
 VAV_BackSlash(const char *s, char *res)
diff --git a/lib/libvarnish/cli_serve.c b/lib/libvarnish/cli_serve.c
index b7c52f4..03cf1d4 100644
--- a/lib/libvarnish/cli_serve.c
+++ b/lib/libvarnish/cli_serve.c
@@ -41,6 +41,7 @@
 
 #include "vqueue.h"
 #include "vsb.h"
+#include "vav.h"
 #include "vlu.h"
 #include "vcli.h"
 #include "cli_priv.h"