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 874e3fd8e956f58ef50dd322b609bc126dada2d8..651dc18881dda862de22fe84261c2cbbee401547 100644 (file)
--- 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 a6b778f470336468b20b6341f8d6638614a6d9e1..09dffdba9217a036b93a8f15bfcd938cbf31ba35 100644 (file)
--- 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 395a44748bc72610073ca7667bc758e645a1e441..eeddb427a6493174f25938b6219824db9e8bc424 100644 (file)
--- 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 362fa95730e349b6457d192b4bab4d0e67d7bc8c..0cb1cbc5f916714565f602243333d4de87a93563 100644 (file)
--- 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 2fdf2a97a3dd212e998e1534b7424bb8e3f2eb35..3566f88910b526e30665f78107f2844fa73cea4c 100644 (file)
--- 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 2e4072523c6eb767944ddb0b931c83b5d815eefd..9738220866a03d27a871de14e31138a01ccc909d 100644 (file)
--- 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 a89e10d064192453ed528a18704750576cc7dff2..317b6efe070ef3d30633e60828bd6c888a268608 100644 (file)
--- 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 36285eaa66d8c2956934b82dcd45e4932b4ad05e..493eb8d5554fdd0df9e139a5205f83e0773fed8a 100644 (file)
--- 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 f12d1b08fceb4646de2bec471604f8f3cb345252..dab65673e9632d7e24be954fc43130328061dc24 100644 (file)
--- 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 0928ef94b7f72ee80dbff52b0d010f6b0011a09d..34a2ff5263f3e98d377fe4dc698a752bc6efd54c 100644 (file)
--- 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 0f2c4e26dabdd16c4f19f0ea510b173491950004..6b2392c95d3149ac3d3edda16bf45342fbcc57d7 100644 (file)
--- 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 c5e2a517eec0a1a8c2161e5ef0090e5671443c40..e817c3226fa12bdfe5a48b120f9aa7e8194f2c16 100644 (file)
--- 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 949e0843243d036e458da69101c521b5b1b7d1a1..58cee809ab8d4d0d5c88f60fce78537ef60ceed0 100644 (file)
--- 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 9438a00737863323638e0ea5650a556cdc493fb3..d62d62c18c3bea45cef65669d3d198057298b548 100644 (file)
--- 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 44559d5ebf1c202f8408f71296b2f4940a163395..2a14bd0a3041e31e073f9d20a7064554d707bcf2 100644 (file)
--- 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 b341ef166c93a0c0a8531f23452d5ac75d584117..46f329919ea8db997c38ed2fc29a0a6dd168c493 100644 (file)
--- 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 2a085f3a79b1d1433d115ace5758a645f0bc15cf..72d861cd752c5f99c399e5ff342ef5c8eee23844 100644 (file)
--- 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 0b177a12ee4056d0c37bf9ac783c5a7b1729a1f3..a3cf38d9248e8005168c3686223b6a2bb13c94c1 100644 (file)
--- 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 1a40b34d44bed8c0ef4dffc20a8d889e6fcf043a..9d8c9cb4c1810fd83b738ff10c3831ea4244b7fb 100644 (file)
--- 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 6c4234cdf88413a31b00768a3ca5c1dfa2b551a2..5fa8bb8b2bf11b65fb8f957f63d9d6e46baa0bb3 100644 (file)
--- 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 39c3f48883f556524622a7f2694b910e3d1f2187..e40e1e073ee15fbd189ac7ef1b7094688c84f534 100644 (file)
--- 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 4ab8c5d2d7bd7e480e30f8f2c933470460ea510f..515977193c032f8ad75dd850af79c1fa06fb7766 100644 (file)
--- 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 821ed8d1e9915237dff3753e0f67fc536e4ab3f5..218b3f81742e30ad1e47730dca093c8de2bcfd7d 100644 (file)
--- 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 ed25af275b5c5a77be5c2af40551a5efb650fc25..08b1b505dd7499adf7cafc93a7536d8ed3d1618d 100644 (file)
--- 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 b8526b511b13bd01ed38c5510496ae494582e24e..cb02303581147b3e89d6ac8f0e32a377a6c4007b 100644 (file)
--- 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"
 
 /*--------------------------------------------------------------------*/