X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Ffilter%2Ffilter-ast.h;h=5033b46ea403a2817b794d3d56ebf3460fb062f9;hb=348ddc5c9107149d48b1f12d31a7e75e9b73b4da;hp=29fde10f8c126f7cd430b9a8f498987386801d03;hpb=e4d2f27a74baf6942ac8fcafd5ea53e775ceceb3;p=lttng-tools.git

diff --git a/src/common/filter/filter-ast.h b/src/common/filter/filter-ast.h
index 29fde10f8..5033b46ea 100644
--- a/src/common/filter/filter-ast.h
+++ b/src/common/filter/filter-ast.h
@@ -17,8 +17,13 @@
  */
 
 #include <urcu/list.h>
+#include <stdio.h>
 #include <stdint.h>
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 #define printf_debug(fmt, args...)					\
 	do {								\
 		if (filter_parser_debug)				\
@@ -88,6 +93,16 @@ enum ast_link_type {
 	AST_LINK_BRACKET,
 };
 
+enum ast_expt_type {
+	AST_EXP_UNKNOWN = 0,
+	AST_EXP_STRING,
+	AST_EXP_CONSTANT,
+	AST_EXP_FLOAT_CONSTANT,
+	AST_EXP_IDENTIFIER,
+	AST_EXP_GLOBAL_IDENTIFIER,
+	AST_EXP_NESTED,
+};
+
 struct filter_node {
 	/*
 	 * Parent node is only set on demand by specific visitor.
@@ -98,20 +113,14 @@ struct filter_node {
 	enum node_type type;
 	union {
 		struct {
+			/* Avoid -Wextern-c-compat warning with clang++. */
+			char unused;
 		} unknown;
 		struct {
 			struct filter_node *child;
 		} root;
 		struct {
-			enum {
-				AST_EXP_UNKNOWN = 0,
-				AST_EXP_STRING,
-				AST_EXP_CONSTANT,
-				AST_EXP_FLOAT_CONSTANT,
-				AST_EXP_IDENTIFIER,
-				AST_EXP_GLOBAL_IDENTIFIER,
-				AST_EXP_NESTED,
-			} type;
+			enum ast_expt_type type;
 			enum ast_link_type post_op;	/* reverse */
 			enum ast_link_type pre_op;	/* forward */
 			union {
@@ -157,8 +166,8 @@ struct filter_parser_ctx {
 	struct filter_ast *ast;
 	struct cds_list_head allocated_strings;
 	struct ir_op *ir_root;
-	struct lttng_filter_bytecode_alloc *bytecode;
-	struct lttng_filter_bytecode_alloc *bytecode_reloc;
+	struct lttng_bytecode_alloc *bytecode;
+	struct lttng_bytecode_alloc *bytecode_reloc;
 };
 
 struct filter_parser_ctx *filter_parser_ctx_alloc(FILE *input);
@@ -185,4 +194,8 @@ int filter_visitor_ir_validate_string(struct filter_parser_ctx *ctx);
 int filter_visitor_ir_normalize_glob_patterns(struct filter_parser_ctx *ctx);
 int filter_visitor_ir_validate_globbing(struct filter_parser_ctx *ctx);
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif /* _FILTER_AST_H */