loci: move IS_FLOW_MOD_SUBTYPE macro to loci_int.h
diff --git a/c_gen/c_code_gen.py b/c_gen/c_code_gen.py
index a39c605..fa4db2a 100644
--- a/c_gen/c_code_gen.py
+++ b/c_gen/c_code_gen.py
@@ -485,25 +485,6 @@
c_match.gen_serialize(out)
c_match.gen_deserialize(out)
-def gen_obj_id_macros(out):
- """
- Flow modify (add, delete) messages (and maybe others) use ID checks allowing
- inheritance to use common accessor functions.
- """
- out.write("""
-/**
- * Macro to detect if an object ID falls in the "flow mod" family of objects
- * This includes add, modify, modify_strict, delete and delete_strict
- */
-#define IS_FLOW_MOD_SUBTYPE(object_id) \\
- (((object_id) == OF_FLOW_MODIFY) || \\
- ((object_id) == OF_FLOW_MODIFY_STRICT) || \\
- ((object_id) == OF_FLOW_DELETE) || \\
- ((object_id) == OF_FLOW_DELETE_STRICT) || \\
- ((object_id) == OF_FLOW_ADD))
-""")
-
-
def top_c_gen(out, name):
"""
Generate code for
@@ -561,7 +542,6 @@
""")
gen_object_enum_str(out)
- gen_obj_id_macros(out)
if config_check("gen_unified_fns"):
gen_accessor_definitions(out)
gen_new_function_definitions(out)
diff --git a/c_gen/templates/loci_int.h b/c_gen/templates/loci_int.h
index bd80b12..4cd48b6 100644
--- a/c_gen/templates/loci_int.h
+++ b/c_gen/templates/loci_int.h
@@ -258,7 +258,16 @@
#define OF_PORT_NO_VALUE_CHECK(port, ver) \
if (((ver) == OF_VERSION_1_0) && ((port) > 0xff00)) (port) += 0xffff0000
-
+/**
+ * Macro to detect if an object ID falls in the "flow mod" family of objects
+ * This includes add, modify, modify_strict, delete and delete_strict
+ */
+#define IS_FLOW_MOD_SUBTYPE(object_id) \
+ (((object_id) == OF_FLOW_MODIFY) || \
+ ((object_id) == OF_FLOW_MODIFY_STRICT) || \
+ ((object_id) == OF_FLOW_DELETE) || \
+ ((object_id) == OF_FLOW_DELETE_STRICT) || \
+ ((object_id) == OF_FLOW_ADD))
#include <loci/loci.h>
#endif /* __LOCI_INT_H__ */