Replace libuuid with internal implementation

[lttng-tools.git] / src / common / sessiond-comm / sessiond-comm.h

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index 6fc65a103167b8a5db13fa99dcc24b1820906fb9..8c2a47538535e2e190a0d72c77b0d8d9b80f9cf9 100644 (file)
--- 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>
 
 /*