[master] dfe2104 File more bits off the VSC api

[Poul-Henning Kamp]

commit dfe21045bd76881909a75a2cb6767ebc681421d1
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri May 26 22:05:22 2017 +0000

    File more bits off the VSC api

diff --git a/bin/varnishd/cache/cache_shmlog.c b/bin/varnishd/cache/cache_shmlog.c
index 9e6ec9e..310df37 100644
--- a/bin/varnishd/cache/cache_shmlog.c
+++ b/bin/varnishd/cache/cache_shmlog.c
@@ -40,6 +40,7 @@
 #include "vend.h"
 #include "vgz.h"
 #include "vsl_priv.h"
+#include "vapi/vsc_int.h"
 #include "vmb.h"
 #include "vtim.h"
 
diff --git a/bin/varnishd/common/common.h b/bin/varnishd/common/common.h
index f0b4cf8..00a8dc6 100644
--- a/bin/varnishd/common/common.h
+++ b/bin/varnishd/common/common.h
@@ -44,7 +44,6 @@
 #include "vdef.h"
 #include "vqueue.h"
 #include "vsb.h"
-#include "vapi/vsc_int.h"
 
 /**********************************************************************/
 
diff --git a/include/vapi/vsc_int.h b/include/vapi/vsc_int.h
index cc48d9c..a767369 100644
--- a/include/vapi/vsc_int.h
+++ b/include/vapi/vsc_int.h
@@ -37,7 +37,3 @@ enum VSC_level_e {
 #include "tbl/vsc_levels.h"
 	VSC_level_MAX,
 };
-
-/* Forward declare the static vsc type names */
-#define VSC_TYPE_F(n,t,l,e,d)		extern const char *VSC_type_##n;
-#include "tbl/vsc_types.h"
diff --git a/lib/libvarnishapi/vsc.c b/lib/libvarnishapi/vsc.c
index 179e2ef..76f62b5 100644
--- a/lib/libvarnishapi/vsc.c
+++ b/lib/libvarnishapi/vsc.c
@@ -269,7 +269,6 @@ vsc_add_vf(struct vsc *vsc, const struct VSM_fantom *fantom, int order)
 	vf->fantom = *fantom;
 	REPLACE(vf->section.type, vf->fantom.type);
 	REPLACE(vf->section.ident, vf->fantom.ident);
-	// vf->section.desc = desc;
 	vf->order = order;
 
 	VTAILQ_FOREACH(vf2, &vsc->vf_list, list) {