[master] 8bd3b43 Move shared stuff from common.h to heritage.h

[Poul-Henning Kamp]

commit 8bd3b43ff831a64c1a8eef6de2f3205699d8d9ee
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Sep 27 07:33:10 2017 +0000

    Move shared stuff from common.h to heritage.h

diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index 004e217..26c4772 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -36,6 +36,7 @@
 #include <stdlib.h>
 
 #include "cache.h"
+#include "common/heritage.h"
 
 #include "vrt.h"
 #include "vcl.h"
diff --git a/bin/varnishd/common/common.h b/bin/varnishd/common/common.h
index 850ad05..9b71491 100644
--- a/bin/varnishd/common/common.h
+++ b/bin/varnishd/common/common.h
@@ -58,11 +58,3 @@ void MCH_Fd_Inherit(int fd, const char *what);
 		fprintf(stderr, "(-? gives usage)\n");		\
 		exit(2);					\
 	} while (0)
-
-/* cache/cache_acceptor.c */
-struct transport;
-void XPORT_Init(void);
-const struct transport *XPORT_Find(const char *name);
-
-/* cache/cache_vcl.c */
-int VCL_TestLoad(const char *);
diff --git a/bin/varnishd/common/heritage.h b/bin/varnishd/common/heritage.h
index 461c387..f2df8c1 100644
--- a/bin/varnishd/common/heritage.h
+++ b/bin/varnishd/common/heritage.h
@@ -1,3 +1,4 @@
+
 /*-
  * Copyright (c) 2006 Verdens Gang AS
  * Copyright (c) 2006-2011 Varnish Software AS
@@ -90,4 +91,13 @@ struct heritage {
 
 extern struct heritage heritage;
 
+/* cache/cache_main.c */
 void child_main(void);
+
+/* cache/cache_vcl.c */
+int VCL_TestLoad(const char *);
+
+/* cache/cache_acceptor.c */
+struct transport;
+void XPORT_Init(void);
+const struct transport *XPORT_Find(const char *name);
diff --git a/bin/varnishd/mgt/mgt_vcc.c b/bin/varnishd/mgt/mgt_vcc.c
index 641131a..42f4b6d 100644
--- a/bin/varnishd/mgt/mgt_vcc.c
+++ b/bin/varnishd/mgt/mgt_vcc.c
@@ -40,6 +40,7 @@
 #include <sys/stat.h>
 
 #include "mgt/mgt.h"
+#include "common/heritage.h"
 #include "storage/storage.h"
 
 #include "libvcc.h"