[master] 95584d2 And I overlooked that bit of course...

[Poul-Henning Kamp]

commit 95584d2170c03d30bc50aa9c2a3169587c0e6f4b
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Jan 3 10:07:26 2017 +0000

    And I overlooked that bit of course...

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 96bbaf9..ebf5eb2 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -253,12 +253,11 @@ struct acct_bereq {
 
 #define L0(t, n)
 #define L1(t, n)		t n;
-#define VSC_F(n,t,l,s,f,v,d,e)	L##l(t, n)
+#define VSC_FF(n,t,l,s,f,v,d,e)	L##l(t, n)
 struct dstat {
 	unsigned		summs;
 #include "tbl/vsc_f_main.h"
 };
-#undef VSC_F
 #undef L0
 #undef L1
 
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index 47e8611..be26db4 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -58,9 +58,8 @@ pool_sumstat(const struct dstat *src)
 	Lck_AssertHeld(&wstat_mtx);
 #define L0(n)
 #define L1(n) (VSC_C_main->n += src->n)
-#define VSC_F(n,t,l,s,f,v,d,e)	L##l(n);
+#define VSC_FF(n,t,l,s,f,v,d,e)	L##l(n);
 #include "tbl/vsc_f_main.h"
-#undef VSC_F
 #undef L0
 #undef L1
 }
diff --git a/bin/varnishd/cache/cache_wrk.c b/bin/varnishd/cache/cache_wrk.c
index 1e63c3b..47b3fd7 100644
--- a/bin/varnishd/cache/cache_wrk.c
+++ b/bin/varnishd/cache/cache_wrk.c
@@ -140,9 +140,8 @@ pool_addstat(struct dstat *dst, struct dstat *src)
 	dst->summs++;
 #define L0(n)
 #define L1(n) (dst->n += src->n)
-#define VSC_F(n,t,l,s,f,v,d,e)	L##l(n);
+#define VSC_FF(n,t,l,s,f,v,d,e)	L##l(n);
 #include "tbl/vsc_f_main.h"
-#undef VSC_F
 #undef L0
 #undef L1
 	memset(src, 0, sizeof *src);
diff --git a/bin/varnishstat/vsc2rst.c b/bin/varnishstat/vsc2rst.c
index f955b78..d1a97f4 100644
--- a/bin/varnishstat/vsc2rst.c
+++ b/bin/varnishstat/vsc2rst.c
@@ -38,10 +38,6 @@
 
 #define P(x)			\
 	printf(x "\n")
-#define VSC_LEVEL_F(v,l,e,d)		\
-	printf("%s – %s\n\t%s\n\n", l, e, d);
-#define VSC_F(n, t, l, s, f, v, d, e)	\
-	printf("%s – %s (%s)\n\t%s\n\n", #n, d, VSC_level_##v, e);
 
 int main(int argc, char **argv)
 {
@@ -50,18 +46,24 @@ int main(int argc, char **argv)
 	P("COUNTER LEVELS");
 	P("==============");
 	P("");
+#define VSC_LEVEL_F(v,l,e,d)		\
+	printf("%s – %s\n\t%s\n\n", l, e, d);
 #include "tbl/vsc_levels.h"
 
 	P("");
 	P("MAIN COUNTERS (MAIN.*)");
 	P("======================");
 	P("");
+#define VSC_FF(n, t, l, s, f, v, d, e)	\
+	printf("%s – %s (%s)\n\t%s\n\n", #n, d, VSC_level_##v, e);
 #include "tbl/vsc_f_main.h"
 
 	P("MANAGEMENT PROCESS COUNTERS (MGT.*)");
 	P("===================================");
 	P("");
 #define VSC_DO_MGT
+#define VSC_FF(n, t, l, s, f, v, d, e)	\
+	printf("%s – %s (%s)\n\t%s\n\n", #n, d, VSC_level_##v, e);
 #include "tbl/vsc_fields.h"
 #undef VSC_DO_MGT
 
@@ -70,6 +72,8 @@ int main(int argc, char **argv)
 	P("====================================");
 	P("");
 #define VSC_DO_MEMPOOL
+#define VSC_FF(n, t, l, s, f, v, d, e)	\
+	printf("%s – %s (%s)\n\t%s\n\n", #n, d, VSC_level_##v, e);
 #include "tbl/vsc_fields.h"
 #undef VSC_DO_MEMPOOL
 
@@ -78,6 +82,8 @@ int main(int argc, char **argv)
 	P("===================================");
 	P("");
 #define VSC_DO_SMA
+#define VSC_FF(n, t, l, s, f, v, d, e)	\
+	printf("%s – %s (%s)\n\t%s\n\n", #n, d, VSC_level_##v, e);
 #include "tbl/vsc_fields.h"
 #undef  VSC_DO_SMA
 
@@ -86,6 +92,8 @@ int main(int argc, char **argv)
 	P("=================================");
 	P("");
 #define VSC_DO_SMF
+#define VSC_FF(n, t, l, s, f, v, d, e)	\
+	printf("%s – %s (%s)\n\t%s\n\n", #n, d, VSC_level_##v, e);
 #include "tbl/vsc_fields.h"
 #undef VSC_DO_SMF
 
@@ -94,6 +102,8 @@ int main(int argc, char **argv)
 	P("============================");
 	P("");
 #define VSC_DO_VBE
+#define VSC_FF(n, t, l, s, f, v, d, e)	\
+	printf("%s – %s (%s)\n\t%s\n\n", #n, d, VSC_level_##v, e);
 #include "tbl/vsc_fields.h"
 #undef VSC_DO_VBE
 
@@ -102,6 +112,8 @@ int main(int argc, char **argv)
 	P("=====================");
 	P("");
 #define VSC_DO_LCK
+#define VSC_FF(n, t, l, s, f, v, d, e)	\
+	printf("%s – %s (%s)\n\t%s\n\n", #n, d, VSC_level_##v, e);
 #include "tbl/vsc_fields.h"
 #undef VSC_DO_LCK