X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=include%2Flttng%2Fust-events.h;h=2bbe785e6850e8c5c21bf54f6ad81011168bfb09;hb=578ce73a104b847b78790041bf30aa9aaa310dd0;hp=476ddd7845a5ea264bf0b837ad37aaa91ad66d86;hpb=52367557562008ab80a94adbaf047dd44b282d15;p=lttng-ust.git

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 476ddd78..2bbe785e 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -20,14 +20,13 @@
 
 #include <urcu/list.h>
 #include <urcu/hlist.h>
+#include <uuid/uuid.h>
 #include <stdint.h>
 #include <lttng/ust-abi.h>
 #include <lttng/ust-tracer.h>
 #include <lttng/ust-endian.h>
 #include <float.h>
 
-#define LTTNG_UST_UUID_LEN		16
-
 struct ltt_channel;
 struct ltt_session;
 struct lttng_ust_lib_ring_buffer_ctx;
@@ -77,7 +76,7 @@ struct lttng_enum_entry {
 		  .size = sizeof(_type) * CHAR_BIT,		\
 		  .alignment = lttng_alignof(_type) * CHAR_BIT,	\
 		  .signedness = lttng_is_signed_type(_type),	\
-		  .reverse_byte_order = _byte_order != BYTE_ORDER,	\
+		  .reverse_byte_order = _byte_order != __BYTE_ORDER,	\
 		  .base = _base,				\
 		  .encoding = lttng_encode_##_encoding,		\
 		},						\
@@ -324,7 +323,7 @@ struct ltt_channel {
 	/* Channel ID, available for consumer too */
 	unsigned int id;
 	/* Copy of session UUID for consumer (availability through shm) */
-	unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */
+	uuid_t uuid;			/* Trace session unique ID */
 };
 
 struct ltt_session {
@@ -337,7 +336,7 @@ struct ltt_session {
 	struct cds_list_head wildcards;	/* Wildcard list head */
 	struct cds_list_head list;	/* Session list */
 	unsigned int free_chan_id;	/* Next chan ID to allocate */
-	unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */
+	uuid_t uuid;			/* Trace session unique ID */
 	unsigned int metadata_dumped:1;
 };