[RFC v1 1/2] libtracefs: Use explicit libtraceevent include path

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The libtraceevent pkg-config generated by meson is not adding the
subdirectory to the CLFAGS. This is generally a good idea in order to
avoid any file name collisions. Hence use explicit include paths for
libtraceevent.

Signed-off-by: Daniel Wagner <dwagner@xxxxxxx>
---
 include/tracefs.h     | 2 +-
 src/tracefs-events.c  | 2 +-
 src/tracefs-filter.c  | 2 +-
 src/tracefs-sqlhist.c | 2 +-
 src/tracefs-utils.c   | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/tracefs.h b/include/tracefs.h
index 693860d47a56..dd339464ca0e 100644
--- a/include/tracefs.h
+++ b/include/tracefs.h
@@ -8,7 +8,7 @@
 
 #include <fcntl.h>
 #include <sched.h>
-#include <event-parse.h>
+#include <libtraceevent/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 65d5707362c6..ebff59e4cb7a 100644
--- a/src/tracefs-events.c
+++ b/src/tracefs-events.c
@@ -15,7 +15,7 @@
 #include <fcntl.h>
 #include <limits.h>
 
-#include <kbuffer.h>
+#include <libtraceevent/kbuffer.h>
 
 #include "tracefs.h"
 #include "tracefs-local.h"
diff --git a/src/tracefs-filter.c b/src/tracefs-filter.c
index 85d0be17f6b7..cac4e255d7d4 100644
--- a/src/tracefs-filter.c
+++ b/src/tracefs-filter.c
@@ -6,7 +6,7 @@
  * Copyright (C) 2021, VMware, Tzvetomir Stoyanov <tz.stoyanov@xxxxxxxxx>
  *
  */
-#include <trace-seq.h>
+#include <libtraceevent/trace-seq.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
diff --git a/src/tracefs-sqlhist.c b/src/tracefs-sqlhist.c
index 27c9c82647e4..fbdf29d5bebb 100644
--- a/src/tracefs-sqlhist.c
+++ b/src/tracefs-sqlhist.c
@@ -6,7 +6,7 @@
  * Copyright (C) 2021, VMware, Tzvetomir Stoyanov <tz.stoyanov@xxxxxxxxx>
  *
  */
-#include <trace-seq.h>
+#include <libtraceevent/trace-seq.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <ctype.h>
diff --git a/src/tracefs-utils.c b/src/tracefs-utils.c
index 22f82afe032b..c1260d3c7c8a 100644
--- a/src/tracefs-utils.c
+++ b/src/tracefs-utils.c
@@ -15,8 +15,8 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include <event-parse.h>
-#include <event-utils.h>
+#include <libtraceevent/event-parse.h>
+#include <libtraceevent/event-utils.h>
 #include "tracefs.h"
 #include "tracefs-local.h"
 
-- 
2.36.1




[Index of Archives]     [Linux USB Development]     [Linux USB Development]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux