linux-trace-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: Linux Trace Devel <linux-trace-devel@vger.kernel.org>
Cc: John 'Warthog9' Hawley <warthog9@kernel.org>
Subject: [PATCH] libtracefs: Remove "traceevent/" from referencing libtraceevent headers
Date: Fri, 16 Jul 2021 22:06:49 -0400	[thread overview]
Message-ID: <20210716220649.46aab3f7@rorschach.local.home> (raw)

From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>

"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@goodmis.org>
---
 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


             reply	other threads:[~2021-07-17  2:06 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-17  2:06 Steven Rostedt [this message]
2021-07-17  3:00 ` [PATCH] libtracefs: Remove "traceevent/" from referencing libtraceevent headers Steven Rostedt
2021-07-26 10:25 ` Yordan Karadzhov (VMware)
2021-07-26 15:24   ` Steven Rostedt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210716220649.46aab3f7@rorschach.local.home \
    --to=rostedt@goodmis.org \
    --cc=linux-trace-devel@vger.kernel.org \
    --cc=warthog9@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).