X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=8c2a47538535e2e190a0d72c77b0d8d9b80f9cf9;hp=6fc65a103167b8a5db13fa99dcc24b1820906fb9;hb=c70636a7342f34e3be68fcf411cf3e3718b8e73f;hpb=ecd1a12fac39784bded85c0f06e47ace2dc98cde

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index 6fc65a103..8c2a47538 100644
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -35,7 +35,7 @@
 #include <common/compat/socket.h>
 #include <common/uri.h>
 #include <common/defaults.h>
-#include <common/compat/uuid.h>
+#include <common/uuid.h>
 #include <common/macros.h>
 #include <common/optional.h>
 
@@ -543,7 +543,7 @@ struct lttcomm_consumer_msg {
 			uint64_t key;				/* Unique channel key. */
 			/* ID of the session's current trace chunk. */
 			LTTNG_OPTIONAL_COMM(uint64_t) LTTNG_PACKED chunk_id;
-			unsigned char uuid[UUID_LEN];	/* uuid for ust tracer. */
+			unsigned char uuid[LTTNG_UUID_LEN];	/* uuid for ust tracer. */
 			uint32_t chan_id;			/* Channel ID on the tracer side. */
 			uint64_t tracefile_size;	/* bytes */
 			uint32_t tracefile_count;	/* number of tracefiles */
@@ -693,14 +693,14 @@ struct lttcomm_consumer_status_channel {
 	unsigned int stream_count;
 } LTTNG_PACKED;
 
-#ifdef HAVE_LIBLTTNG_UST_CTL
-
 struct lttcomm_consumer_close_trace_chunk_reply {
 	enum lttcomm_return_code ret_code;
 	uint32_t path_length;
 	char path[];
 };
 
+#ifdef HAVE_LIBLTTNG_UST_CTL
+
 #include <lttng/ust-abi.h>
 
 /*