X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Fctf-text.c;h=3b38ecaca9671fe88815ea5639ef264797f3212b;hp=bf028615fd301fbfd922528bed6471eb14a8474d;hb=4716614abaa127d6d6722c845a413495d9cb2b6f;hpb=e419579102094d83539d79ce6af83d9786d387ee

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index bf028615..3b38ecac 100644
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -24,7 +24,6 @@
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/ctf/events-internal.h>
 #include <inttypes.h>
-#include <uuid/uuid.h>
 #include <sys/mman.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -212,15 +211,15 @@ const char *print_loglevel(int value)
 }
 
 static
-int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream *stream)
+int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *stream)
 			 
 {
 	struct ctf_text_stream_pos *pos =
 		container_of(ppos, struct ctf_text_stream_pos, parent);
-	struct ctf_stream_class *stream_class = stream->stream_class;
+	struct ctf_stream_declaration *stream_class = stream->stream_class;
 	int field_nr_saved;
-	struct ctf_event *event_class;
-	struct ctf_stream_event *event;
+	struct ctf_event_declaration *event_class;
+	struct ctf_event_definition *event;
 	uint64_t id;
 	int ret;
 	int dom_print = 0;