perf parse-events: Avoid enum forward declaration.
Ian Rogers
reviewerPATCH 1/1 perf parse-events: Avoid enum forward declaration.
Enum forward declarations aren't allowed as the size can't be implied. Switch to just using an int. This fixes a clang warning:
In file included from tools/perf/bench/evlist-open-close.c:13:tools/perf/bench/../util/parse-events.h:185:6: error: redeclaration of already-defined enum 'perf_tool_event' is a GNU extension [-Werror,-Wgnu-redeclared-enum]
enum perf_tool_event;
^
tools/perf/bench/../util/evsel.h:28:6: note: previous definition is here
enum perf_tool_event {
^--- tools/perf/util/parse-events.c | 2 +- tools/perf/util/parse-events.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)
tools/perf/util/parse-events.c +1 -1
@@ -1471,7 +1471,7 @@ int parse_events_add_numeric(struct parse_events_state *parse_state,int parse_events_add_tool (struct parse_events_state *parse_state,struct list_head *list, -enum perf_tool_event tool_event) +int tool_event) {return add_event_tool (list, &parse_state->idx, tool_event); }
tools/perf/util/parse-events.h +1 -2
@@ -182,10 +182,9 @@ int parse_events_add_numeric(struct parse_events_state *parse_state,struct list_head *list, u32 type, u64 config, struct list_head *head_config); -enum perf_tool_event ;int parse_events_add_tool (struct parse_events_state *parse_state,struct list_head *list, -enum perf_tool_event tool_event); +int tool_event); int parse_events_add_cache(struct list_head *list, int *idx, char *type, char *op_result1, char *op_result2, struct parse_events_error *error,
Signature · 1 line
2.33.0.309.g3052b89438-goog
Em Wed, Sep 15, 2021 at 02:14:28PM -0700, Ian Rogers escreveu:
Quoted 10 lines
Enum forward declarations aren't allowed as the size can't be implied. Switch to just using an int. This fixes a clang warning:
In file included from
tools/perf/bench/evlist-open-close.c:13:tools/perf/bench/../util/parse-events.h:185:6: error: redeclaration of already-defined enum 'perf_tool_event' is a GNU extension [-Werror,-Wgnu-redeclared-enum]enum perf_tool_event; ^ tools/perf/bench/../util/evsel.h:28:6: note: previous definition is here enum perf_tool_event { ^
Thanks, applied.
- Arnaldo
Quoted 37 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/util/parse-events.c | 2 +- tools/perf/util/parse-events.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)tools/perf/util/parse-events.c +1
-1@@ -1471,7 +1471,7 @@ int parse_events_add_numeric(struct parse_events_state *parse_state,int parse_events_add_tool (struct parse_events_state *parse_state,struct list_head *list, -enum perf_tool_event tool_event) +int tool_event) {return add_event_tool (list, &parse_state->idx, tool_event); }tools/perf/util/parse-events.h +1
-2@@ -182,10 +182,9 @@ int parse_events_add_numeric(struct parse_events_state *parse_state,struct list_head *list, u32 type, u64 config, struct list_head *head_config); -enum perf_tool_event ;int parse_events_add_tool (struct parse_events_state *parse_state,struct list_head *list, -enum perf_tool_event tool_event); +int tool_event); int parse_events_add_cache(struct list_head *list, int *idx, char *type, char *op_result1, char *op_result2, struct parse_events_error *error,Signature · 1 line
2.33.0.309.g3052b89438-goog
Signature · 1 line
- Arnaldo