X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctf-writer%2Ftrace.h;h=231e97b0a26ce027908ad2f446129bbabc866802;hb=6162e6b7a6d907974d954419c2375f654f39eb72;hp=ae5f1ec3918d6841a8f4f608baf750ff5122c970;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d;p=babeltrace.git

diff --git a/src/ctf-writer/trace.h b/src/ctf-writer/trace.h
index ae5f1ec3..231e97b0 100644
--- a/src/ctf-writer/trace.h
+++ b/src/ctf-writer/trace.h
@@ -28,8 +28,8 @@
  * http://www.efficios.com/ctf
  */
 
-#include "common/babeltrace.h"
-#include "compat/uuid.h"
+#include "common/macros.h"
+#include "common/uuid.h"
 #include <babeltrace2/ctf-writer/field-types.h>
 #include <babeltrace2/ctf-writer/fields.h>
 #include <babeltrace2/ctf-writer/trace.h>
@@ -49,7 +49,7 @@ struct bt_ctf_trace_common {
 	struct bt_ctf_object base;
 	GString *name;
 	int frozen;
-	unsigned char uuid[BABELTRACE_UUID_LEN];
+	bt_uuid_t uuid;
 	bt_bool uuid_set;
 	enum bt_ctf_byte_order native_byte_order;
 	struct bt_ctf_private_value *environment;
@@ -88,14 +88,14 @@ BT_HIDDEN
 int bt_ctf_trace_common_set_name(struct bt_ctf_trace_common *trace, const char *name);
 
 static inline
-const unsigned char *bt_ctf_trace_common_get_uuid(struct bt_ctf_trace_common *trace)
+const uint8_t *bt_ctf_trace_common_get_uuid(struct bt_ctf_trace_common *trace)
 {
 	BT_CTF_ASSERT_PRE_NON_NULL(trace, "Trace");
 	return trace->uuid_set ? trace->uuid : NULL;
 }
 
 BT_HIDDEN
-int bt_ctf_trace_common_set_uuid(struct bt_ctf_trace_common *trace, const unsigned char *uuid);
+int bt_ctf_trace_common_set_uuid(struct bt_ctf_trace_common *trace, const uint8_t *uuid);
 
 BT_HIDDEN
 int bt_ctf_trace_common_set_environment_field(struct bt_ctf_trace_common *trace,