From: "Steven Rostedt (VMware)" <rostedt@xxxxxxxxxxx> "pkg-config --cflags --libtraceevent" produces the full path to the libtraceevent headers (including the "traceevent/" portion). There is no need to add that part in the headers. Particularly the one in the main tracefs.h that trace-cmd uses. The version 2.9.4 causes the header to include the libtraceevent/event-parse.h that is local, when it should be using the system headers, and causes it to fail the build. Signed-off-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx> --- include/tracefs.h | 2 +- src/tracefs-events.c | 2 +- src/tracefs-utils.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/tracefs.h b/include/tracefs.h index 7e1927b..2649417 100644 --- a/include/tracefs.h +++ b/include/tracefs.h @@ -9,7 +9,7 @@ #include <sys/stat.h> #include <fcntl.h> #include <sched.h> -#include <traceevent/event-parse.h> +#include <event-parse.h> char *tracefs_get_tracing_file(const char *name); void tracefs_put_tracing_file(char *name); diff --git a/src/tracefs-events.c b/src/tracefs-events.c index 7febc2a..8d84838 100644 --- a/src/tracefs-events.c +++ b/src/tracefs-events.c @@ -15,7 +15,7 @@ #include <fcntl.h> #include <limits.h> -#include <traceevent/kbuffer.h> +#include <kbuffer.h> #include "tracefs.h" #include "tracefs-local.h" diff --git a/src/tracefs-utils.c b/src/tracefs-utils.c index 6750336..600cdf2 100644 --- a/src/tracefs-utils.c +++ b/src/tracefs-utils.c @@ -15,8 +15,8 @@ #include <unistd.h> #include <errno.h> -#include <traceevent/event-parse.h> -#include <traceevent/event-utils.h> +#include <event-parse.h> +#include <event-utils.h> #include "tracefs.h" #include "tracefs-local.h" -- 2.31.1
|