Messages in this thread Patch in this message | | | From | Namhyung Kim <> | Subject | [PATCH 32/42] perf tools: Move BUILD_ID_SIZE definition to perf.h | Date | Thu, 29 Jan 2015 17:07:13 +0900 |
| |
The util/event.h includes util/build-id.h only for BUILD_ID_SIZE. This is a problem when I include util/event.h from util/tool.h which is also included by util/build-id.h since it now makes a circular dependency resulting in incomplete type error.
Signed-off-by: Namhyung Kim <namhyung@kernel.org> --- tools/perf/perf.h | 1 + tools/perf/util/build-id.h | 2 -- tools/perf/util/dso.h | 1 + tools/perf/util/event.h | 1 - 4 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/tools/perf/perf.h b/tools/perf/perf.h index b0fad99c9252..386de322f3a1 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@ -30,6 +30,7 @@ static inline unsigned long long rdclock(void) } #define MAX_NR_CPUS 256 +#define BUILD_ID_SIZE 20 extern const char *input_name; extern bool perf_host, perf_guest; diff --git a/tools/perf/util/build-id.h b/tools/perf/util/build-id.h index 8236319514d5..8f31545edc5b 100644 --- a/tools/perf/util/build-id.h +++ b/tools/perf/util/build-id.h @@ -1,8 +1,6 @@ #ifndef PERF_BUILD_ID_H_ #define PERF_BUILD_ID_H_ 1 -#define BUILD_ID_SIZE 20 - #include "tool.h" #include <linux/types.h> diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h index ac753594a469..c18fcc0e8081 100644 --- a/tools/perf/util/dso.h +++ b/tools/perf/util/dso.h @@ -7,6 +7,7 @@ #include <linux/types.h> #include <linux/bitops.h> #include "map.h" +#include "perf.h" #include "build-id.h" enum dso_binary_type { diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h index 27261320249a..1f86c279520e 100644 --- a/tools/perf/util/event.h +++ b/tools/perf/util/event.h @@ -6,7 +6,6 @@ #include "../perf.h" #include "map.h" -#include "build-id.h" #include "perf_regs.h" struct mmap_event { -- 2.2.2
| |