Cleanup: debug-info: remove include indirection

- Include `babeltrace.h` to use the `bt_field_class` definition directly
instead of relying on `trace-ir-mapping.h`'s inclusion.

- Include `debug-info.h` to use `IP_FIELD_NAME` and `VPID_FIELD_NAME`
defines.

Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: I16d9614f6bdb405e02c2d9f4ee18e02013d1c919
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3614
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/src/plugins/lttng-utils/debug-info/utils.c b/src/plugins/lttng-utils/debug-info/utils.c
index 286a677192c33f4bba3085e9177f9c467f804b8a..b066ea48509891255d3ed70995dbfe584514f9ef 100644 (file)
--- a/src/plugins/lttng-utils/debug-info/utils.c
+++ b/src/plugins/lttng-utils/debug-info/utils.c
@@ -7,6 +7,10 @@
  */
 
 #include <string.h>
+
+#include <babeltrace2/babeltrace.h>
+
+#include "debug-info.h"
 #include "utils.h"
 
 BT_HIDDEN

diff --git a/src/plugins/lttng-utils/debug-info/utils.h b/src/plugins/lttng-utils/debug-info/utils.h
index b23379c426bbd829e8b077af18370560afe8a34f..40ba38ec9170a841553386a368b5714d16006caf 100644 (file)
--- a/src/plugins/lttng-utils/debug-info/utils.h
+++ b/src/plugins/lttng-utils/debug-info/utils.h
@@ -9,8 +9,9 @@
 #ifndef BABELTRACE_PLUGIN_DEBUG_INFO_UTILS_H
 #define BABELTRACE_PLUGIN_DEBUG_INFO_UTILS_H
 
+#include <babeltrace2/babeltrace.h>
+
 #include "common/macros.h"
-#include "trace-ir-mapping.h"
 
 /*
  * Return the location of a path's file (the last element of the path).