[master] d8c04ee Move objcore related enums out of mgt view

Poul-Henning Kamp phk at FreeBSD.org
Tue Feb 9 01:19:11 CET 2016


commit d8c04ee9075a0f9a7ced08f2ec5862d977ac01fc
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Feb 8 20:53:18 2016 +0000

    Move objcore related enums out of mgt view

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 7d3e2c7..3cdaca7 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -398,6 +398,18 @@ struct boc {
  * housekeeping fields parts of an object.
  */
 
+enum obj_attr {
+#define OBJ_ATTR(U, l)  OA_##U,
+#include "tbl/obj_attr.h"
+#undef OBJ_ATTR
+};
+
+enum obj_flags {
+#define OBJ_FLAG(U, l, v)       OF_##U = v,
+#include "tbl/obj_attr.h"
+#undef OBJ_FLAG
+};
+
 struct objcore {
 	unsigned		magic;
 #define OBJCORE_MAGIC		0x4d301302
diff --git a/bin/varnishd/common/common.h b/bin/varnishd/common/common.h
index 0c23ddf..52bbd90 100644
--- a/bin/varnishd/common/common.h
+++ b/bin/varnishd/common/common.h
@@ -40,28 +40,11 @@
 #include "vsb.h"
 #include "vapi/vsc_int.h"
 
-/*
- * Enums cannot be forward declared (any more...) so put it here
- * to make everybody see it.
- */
-
 enum baninfo {
 	BI_NEW,
 	BI_DROP
 };
 
-enum obj_attr {
-#define OBJ_ATTR(U, l)	OA_##U,
-#include "tbl/obj_attr.h"
-#undef OBJ_ATTR
-};
-
-enum obj_flags {
-#define OBJ_FLAG(U, l, v)	OF_##U = v,
-#include "tbl/obj_attr.h"
-#undef OBJ_FLAG
-};
-
 struct cli;
 
 /**********************************************************************



More information about the varnish-commit mailing list