[master] 6114af8 Straighten out #include vsc_int.h visibility

Poul-Henning Kamp phk at varnish-cache.org
Tue Nov 12 23:58:45 CET 2013


commit 6114af8384040d27efd6757cc4399ba83c2175ed
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 12 22:24:59 2013 +0000

    Straighten out #include vsc_int.h visibility

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index e7bffde..ddf9fa2 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -36,7 +36,6 @@
 
 #include "common/common.h"
 
-#include "vapi/vsc_int.h"
 #include "vapi/vsl_int.h"
 
 #include <sys/socket.h>
diff --git a/bin/varnishd/common/common.h b/bin/varnishd/common/common.h
index 43af1c3..f72056a 100644
--- a/bin/varnishd/common/common.h
+++ b/bin/varnishd/common/common.h
@@ -39,6 +39,7 @@
 #include "vdef.h"
 #include "vqueue.h"
 #include "vsb.h"
+#include "vapi/vsc_int.h"
 
 /*
  * Enums cannot be forward declared (any more...) so put it here
diff --git a/bin/varnishd/common/common_vsc.c b/bin/varnishd/common/common_vsc.c
index 7078595..acc8fdd 100644
--- a/bin/varnishd/common/common_vsc.c
+++ b/bin/varnishd/common/common_vsc.c
@@ -28,7 +28,9 @@
  *
  */
 
+#include "common.h"
+
 /* Build the static vsc type names */
-#define VSC_TYPE_F(n,t,l,e,d)		const char *VSC_type_##n = t;
+#define VSC_TYPE_F(n,t,l,e,d) const char *VSC_type_##n = t;
 #include "tbl/vsc_types.h"
 #undef VSC_TYPE_F
diff --git a/bin/varnishd/common/common_vsm.c b/bin/varnishd/common/common_vsm.c
index 6f7f5a3..90863c3 100644
--- a/bin/varnishd/common/common_vsm.c
+++ b/bin/varnishd/common/common_vsm.c
@@ -43,7 +43,6 @@
 #include "common.h"
 
 #include "vapi/vsm_int.h"
-#include "vapi/vsc_int.h"
 #include "vmb.h"
 #include "vtim.h"
 
diff --git a/bin/varnishd/mgt/mgt.h b/bin/varnishd/mgt/mgt.h
index a7ca900..68efbeb 100644
--- a/bin/varnishd/mgt/mgt.h
+++ b/bin/varnishd/mgt/mgt.h
@@ -30,7 +30,6 @@
 
 #include <stdint.h>
 
-#include "vapi/vsc_int.h"
 #include "common/common.h"
 
 struct cli;



More information about the varnish-commit mailing list