From: phk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Tue, 19 Feb 2008 11:52:27 +0000 (+0000)
Subject: Move the #include  of heritage.h to cache.h.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70d976e09955c9eb895de15ea0ba8e74a1a9cab1;p=varnish

Move the #include  of heritage.h to cache.h.


git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2515 d4fa192b-c00b-0410-8231-f00ffab90ce4
---

diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h
index 874e3fd8..651dc188 100644
--- a/varnish-cache/bin/varnishd/cache.h
+++ b/varnish-cache/bin/varnishd/cache.h
@@ -47,6 +47,7 @@
 
 #include "vcl_returns.h"
 #include "common.h"
+#include "heritage.h"
 #include "miniobj.h"
 
 enum {
diff --git a/varnish-cache/bin/varnishd/cache_acceptor.c b/varnish-cache/bin/varnishd/cache_acceptor.c
index a6b778f4..09dffdba 100644
--- a/varnish-cache/bin/varnishd/cache_acceptor.c
+++ b/varnish-cache/bin/varnishd/cache_acceptor.c
@@ -50,7 +50,6 @@
 #include "compat/srandomdev.h"
 #endif
 
-#include "heritage.h"
 #include "shmlog.h"
 #include "cache.h"
 #include "cache_acceptor.h"
diff --git a/varnish-cache/bin/varnishd/cache_acceptor_epoll.c b/varnish-cache/bin/varnishd/cache_acceptor_epoll.c
index 395a4474..eeddb427 100644
--- a/varnish-cache/bin/varnishd/cache_acceptor_epoll.c
+++ b/varnish-cache/bin/varnishd/cache_acceptor_epoll.c
@@ -43,7 +43,6 @@
 
 #include <sys/epoll.h>
 
-#include "heritage.h"
 #include "shmlog.h"
 #include "cache.h"
 #include "cache_acceptor.h"
diff --git a/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c b/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c
index 362fa957..0cb1cbc5 100644
--- a/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c
+++ b/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c
@@ -46,7 +46,6 @@
 
 #include <sys/event.h>
 
-#include "heritage.h"
 #include "shmlog.h"
 #include "cache.h"
 #include "cache_acceptor.h"
diff --git a/varnish-cache/bin/varnishd/cache_acceptor_poll.c b/varnish-cache/bin/varnishd/cache_acceptor_poll.c
index 2fdf2a97..3566f889 100644
--- a/varnish-cache/bin/varnishd/cache_acceptor_poll.c
+++ b/varnish-cache/bin/varnishd/cache_acceptor_poll.c
@@ -41,7 +41,6 @@
 #include <unistd.h>
 #include <poll.h>
 
-#include "heritage.h"
 #include "shmlog.h"
 #include "cache.h"
 #include "cache_acceptor.h"
diff --git a/varnish-cache/bin/varnishd/cache_backend.c b/varnish-cache/bin/varnishd/cache_backend.c
index 2e407252..97382208 100644
--- a/varnish-cache/bin/varnishd/cache_backend.c
+++ b/varnish-cache/bin/varnishd/cache_backend.c
@@ -77,7 +77,6 @@
 #include <sys/socket.h>
 #include <netdb.h>
 
-#include "heritage.h"
 #include "shmlog.h"
 #include "cache.h"
 #include "vrt.h"
diff --git a/varnish-cache/bin/varnishd/cache_center.c b/varnish-cache/bin/varnishd/cache_center.c
index a89e10d0..317b6efe 100644
--- a/varnish-cache/bin/varnishd/cache_center.c
+++ b/varnish-cache/bin/varnishd/cache_center.c
@@ -71,7 +71,6 @@ DOT acceptor -> start [style=bold,color=green,weight=4]
 
 #include "shmlog.h"
 #include "vcl.h"
-#include "heritage.h"
 #include "cache.h"
 
 static unsigned xids;
diff --git a/varnish-cache/bin/varnishd/cache_cli.c b/varnish-cache/bin/varnishd/cache_cli.c
index 36285eaa..493eb8d5 100644
--- a/varnish-cache/bin/varnishd/cache_cli.c
+++ b/varnish-cache/bin/varnishd/cache_cli.c
@@ -45,7 +45,6 @@
 #include "cache.h"
 #include "vlu.h"
 #include "vsb.h"
-#include "heritage.h"
 
 pthread_t	cli_thread;
 
diff --git a/varnish-cache/bin/varnishd/cache_expire.c b/varnish-cache/bin/varnishd/cache_expire.c
index f12d1b08..dab65673 100644
--- a/varnish-cache/bin/varnishd/cache_expire.c
+++ b/varnish-cache/bin/varnishd/cache_expire.c
@@ -47,7 +47,6 @@
 #include "shmlog.h"
 #include "binary_heap.h"
 #include "cache.h"
-#include "heritage.h"
 
 static pthread_t exp_thread;
 static struct binheap *exp_heap;
diff --git a/varnish-cache/bin/varnishd/cache_fetch.c b/varnish-cache/bin/varnishd/cache_fetch.c
index 0928ef94..34a2ff52 100644
--- a/varnish-cache/bin/varnishd/cache_fetch.c
+++ b/varnish-cache/bin/varnishd/cache_fetch.c
@@ -39,7 +39,6 @@
 
 #include "shmlog.h"
 #include "cache.h"
-#include "heritage.h"
 #include "stevedore.h"
 
 /*--------------------------------------------------------------------*/
diff --git a/varnish-cache/bin/varnishd/cache_hash.c b/varnish-cache/bin/varnishd/cache_hash.c
index 0f2c4e26..6b2392c9 100644
--- a/varnish-cache/bin/varnishd/cache_hash.c
+++ b/varnish-cache/bin/varnishd/cache_hash.c
@@ -62,7 +62,6 @@
 
 #include "shmlog.h"
 #include "cache.h"
-#include "heritage.h"
 #include "stevedore.h"
 
 static struct hash_slinger      *hash;
@@ -387,7 +386,6 @@ void
 HSH_Init(void)
 {
 
-	hash = heritage.hash;
 	if (hash->start != NULL)
 		hash->start();
 }
diff --git a/varnish-cache/bin/varnishd/cache_http.c b/varnish-cache/bin/varnishd/cache_http.c
index c5e2a517..e817c322 100644
--- a/varnish-cache/bin/varnishd/cache_http.c
+++ b/varnish-cache/bin/varnishd/cache_http.c
@@ -42,7 +42,6 @@
 #include <string.h>
 #include <strings.h>
 
-#include "heritage.h"
 #include "shmlog.h"
 #include "cache.h"
 
diff --git a/varnish-cache/bin/varnishd/cache_main.c b/varnish-cache/bin/varnishd/cache_main.c
index 949e0843..58cee809 100644
--- a/varnish-cache/bin/varnishd/cache_main.c
+++ b/varnish-cache/bin/varnishd/cache_main.c
@@ -38,7 +38,6 @@
 
 #include "shmlog.h"
 #include "cache.h"
-#include "heritage.h"
 #include "stevedore.h"
 
 /*--------------------------------------------------------------------
diff --git a/varnish-cache/bin/varnishd/cache_pipe.c b/varnish-cache/bin/varnishd/cache_pipe.c
index 9438a007..d62d62c1 100644
--- a/varnish-cache/bin/varnishd/cache_pipe.c
+++ b/varnish-cache/bin/varnishd/cache_pipe.c
@@ -41,7 +41,6 @@
 #include <sys/socket.h>
 
 #include "shmlog.h"
-#include "heritage.h"
 #include "cache.h"
 
 static int
diff --git a/varnish-cache/bin/varnishd/cache_pool.c b/varnish-cache/bin/varnishd/cache_pool.c
index 44559d5e..2a14bd0a 100644
--- a/varnish-cache/bin/varnishd/cache_pool.c
+++ b/varnish-cache/bin/varnishd/cache_pool.c
@@ -53,7 +53,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "heritage.h"
 #include "shmlog.h"
 #include "vcl.h"
 #include "cli_priv.h"
diff --git a/varnish-cache/bin/varnishd/cache_response.c b/varnish-cache/bin/varnishd/cache_response.c
index b341ef16..46f32991 100644
--- a/varnish-cache/bin/varnishd/cache_response.c
+++ b/varnish-cache/bin/varnishd/cache_response.c
@@ -38,7 +38,6 @@
 #include <stdlib.h>
 
 #include "shmlog.h"
-#include "heritage.h"
 #include "cache.h"
 
 /*--------------------------------------------------------------------*/
diff --git a/varnish-cache/bin/varnishd/cache_session.c b/varnish-cache/bin/varnishd/cache_session.c
index 2a085f3a..72d861cd 100644
--- a/varnish-cache/bin/varnishd/cache_session.c
+++ b/varnish-cache/bin/varnishd/cache_session.c
@@ -56,7 +56,6 @@
 #include <sys/uio.h>
 #include <sys/socket.h>
 
-#include "heritage.h"
 #include "shmlog.h"
 #include "cache.h"
 
diff --git a/varnish-cache/bin/varnishd/cache_synthetic.c b/varnish-cache/bin/varnishd/cache_synthetic.c
index 0b177a12..a3cf38d9 100644
--- a/varnish-cache/bin/varnishd/cache_synthetic.c
+++ b/varnish-cache/bin/varnishd/cache_synthetic.c
@@ -37,7 +37,6 @@
 
 #include "shmlog.h"
 #include "cache.h"
-#include "heritage.h"
 #include "stevedore.h"
 
 /*
diff --git a/varnish-cache/bin/varnishd/cache_vrt.c b/varnish-cache/bin/varnishd/cache_vrt.c
index 1a40b34d..9d8c9cb4 100644
--- a/varnish-cache/bin/varnishd/cache_vrt.c
+++ b/varnish-cache/bin/varnishd/cache_vrt.c
@@ -44,7 +44,6 @@
 #include <stdarg.h>
 
 #include "shmlog.h"
-#include "heritage.h"
 #include "vrt.h"
 #include "vrt_obj.h"
 #include "vcl.h"
diff --git a/varnish-cache/bin/varnishd/cache_vrt_esi.c b/varnish-cache/bin/varnishd/cache_vrt_esi.c
index 6c4234cd..5fa8bb8b 100644
--- a/varnish-cache/bin/varnishd/cache_vrt_esi.c
+++ b/varnish-cache/bin/varnishd/cache_vrt_esi.c
@@ -50,7 +50,6 @@
 #include <stdarg.h>
 
 #include "shmlog.h"
-#include "heritage.h"
 #include "vrt.h"
 #include "vcl.h"
 #include "cache.h"
diff --git a/varnish-cache/bin/varnishd/cache_ws.c b/varnish-cache/bin/varnishd/cache_ws.c
index 39c3f488..e40e1e07 100644
--- a/varnish-cache/bin/varnishd/cache_ws.c
+++ b/varnish-cache/bin/varnishd/cache_ws.c
@@ -41,7 +41,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "heritage.h"
 #include "shmlog.h"
 #include "vcl.h"
 #include "cli_priv.h"
diff --git a/varnish-cache/bin/varnishd/rfc2616.c b/varnish-cache/bin/varnishd/rfc2616.c
index 4ab8c5d2..51597719 100644
--- a/varnish-cache/bin/varnishd/rfc2616.c
+++ b/varnish-cache/bin/varnishd/rfc2616.c
@@ -39,7 +39,6 @@
 
 #include "shmlog.h"
 #include "cache.h"
-#include "heritage.h"
 
 
 /*--------------------------------------------------------------------
diff --git a/varnish-cache/bin/varnishd/shmlog.c b/varnish-cache/bin/varnishd/shmlog.c
index 821ed8d1..218b3f81 100644
--- a/varnish-cache/bin/varnishd/shmlog.c
+++ b/varnish-cache/bin/varnishd/shmlog.c
@@ -43,8 +43,6 @@
 #include "shmlog.h"
 #include "cache.h"
 
-#include "heritage.h"
-
 #define LOCKSHM(foo)					\
 	do {						\
 		if (pthread_mutex_trylock(foo)) {	\
diff --git a/varnish-cache/bin/varnishd/stevedore.c b/varnish-cache/bin/varnishd/stevedore.c
index ed25af27..08b1b505 100644
--- a/varnish-cache/bin/varnishd/stevedore.c
+++ b/varnish-cache/bin/varnishd/stevedore.c
@@ -35,7 +35,6 @@
 #include <string.h>
 
 #include "cache.h"
-#include "heritage.h"
 #include "stevedore.h"
 
 /*
diff --git a/varnish-cache/bin/varnishd/tcp.c b/varnish-cache/bin/varnishd/tcp.c
index b8526b51..cb023035 100644
--- a/varnish-cache/bin/varnishd/tcp.c
+++ b/varnish-cache/bin/varnishd/tcp.c
@@ -47,7 +47,6 @@
 #include "compat/strlcpy.h"
 #endif
 
-#include "heritage.h"
 #include "mgt.h"
 
 /*--------------------------------------------------------------------*/