X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Fust-registry.h;h=0b52cc1e1c9541c7743496b7ce4c87f16fe7af2d;hb=c70636a7342f34e3be68fcf411cf3e3718b8e73f;hp=2fc2dff87b8e72f074d8e524f33580aae01f1550;hpb=8de8806159d9d2544e2bc3091cc3c98abe4d97ad;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-registry.h b/src/bin/lttng-sessiond/ust-registry.h
index 2fc2dff87..0b52cc1e1 100644
--- a/src/bin/lttng-sessiond/ust-registry.h
+++ b/src/bin/lttng-sessiond/ust-registry.h
@@ -22,9 +22,9 @@
 #include <stdint.h>
 
 #include <common/hashtable/hashtable.h>
-#include <common/compat/uuid.h>
+#include <common/uuid.h>
 
-#include "ust-ctl.h"
+#include "lttng-ust-ctl.h"
 
 #define CTF_SPEC_MAJOR	1
 #define CTF_SPEC_MINOR	8
@@ -48,7 +48,7 @@ struct ust_registry_session {
 	/* Next enumeration ID available. */
 	uint64_t next_enum_id;
 	/* Universal unique identifier used by the tracer. */
-	unsigned char uuid[UUID_LEN];
+	unsigned char uuid[LTTNG_UUID_LEN];
 
 	/* session ABI description */
 
@@ -365,7 +365,7 @@ int ust_registry_session_init(struct ust_registry_session **sessionp,
 		uid_t euid,
 		gid_t egid,
 		uint64_t tracing_id,
-		uid_t tracing_uid);
+		uid_t tracing_uid)
 {
 	return 0;
 }