X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Flttng-utils%2Fdebug-info%2Fbin-info.h;h=c193a06de28383a79f9b6713704f1af7da76bbba;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=f6848fb3bae6c7e8ff529b39d94ce172269ab9b9;hpb=1e638f98d6c4f2c799d4ea4c826f711a59d9f531;p=babeltrace.git

diff --git a/plugins/lttng-utils/debug-info/bin-info.h b/plugins/lttng-utils/debug-info/bin-info.h
index f6848fb3..c193a06d 100644
--- a/plugins/lttng-utils/debug-info/bin-info.h
+++ b/plugins/lttng-utils/debug-info/bin-info.h
@@ -31,13 +31,14 @@
 #include <stdbool.h>
 #include <gelf.h>
 #include <elfutils/libdw.h>
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/fd-cache-internal.h>
+#include <babeltrace2/babeltrace-internal.h>
+#include <babeltrace2/fd-cache-internal.h>
 
 #define DEFAULT_DEBUG_DIR "/usr/lib/debug"
-#define DEBUG_SUBDIR ".debug/"
-#define BUILD_ID_SUBDIR ".build-id/"
+#define DEBUG_SUBDIR ".debug"
+#define BUILD_ID_SUBDIR ".build-id"
 #define BUILD_ID_SUFFIX ".debug"
+#define BUILD_ID_PREFIX_DIR_LEN 2
 
 struct bin_info {
 	/* Base virtual memory address. */
@@ -66,7 +67,7 @@ struct bin_info {
 	gchar *debug_info_dir;
 	/* Denotes whether the executable is position independent code. */
 	bool is_pic:1;
-	/* denotes whether the build id in the trace matches to one on disk. */
+	/* Denotes whether the build id in the trace matches to one on disk. */
 	bool file_build_id_matches:1;
 	/*
 	 * Denotes whether the executable only has ELF symbols and no