X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fformat.h;h=f1f87632980a6e2c868a46d3327fe473bf3535e7;hp=d0f9378e5dfce942c785858345b2bd298e47c060;hb=37b99bdba8478569634dd5ceecea50d1e9f9ac0a;hpb=1b8455b701df7ac196e35795b9ab8ef2d402058d

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index d0f9378e..f1f87632 100644
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -49,16 +49,16 @@ struct bt_trace_handle;
 struct bt_trace_descriptor {
 };
 
-struct mmap_stream {
+struct bt_mmap_stream {
 	int fd;
 	struct bt_list_head list;
 };
 
-struct mmap_stream_list {
+struct bt_mmap_stream_list {
 	struct bt_list_head head;
 };
 
-struct format {
+struct bt_format {
 	bt_intern_str name;
 
 	struct bt_trace_descriptor *(*open_trace)(const char *path, int flags,
@@ -66,7 +66,7 @@ struct format {
 				size_t index, int whence),
 			FILE *metadata_fp);
 	struct bt_trace_descriptor *(*open_mmap_trace)(
-			struct mmap_stream_list *mmap_list,
+			struct bt_mmap_stream_list *mmap_list,
 			void (*packet_seek)(struct bt_stream_pos *pos,
 				size_t index, int whence),
 			FILE *metadata_fp);
@@ -82,10 +82,10 @@ struct format {
 	int (*convert_index_timestamp)(struct bt_trace_descriptor *descriptor);
 };
 
-extern struct format *bt_lookup_format(bt_intern_str qname);
+extern struct bt_format *bt_lookup_format(bt_intern_str qname);
 extern void bt_fprintf_format_list(FILE *fp);
-extern int bt_register_format(struct format *format);
-extern void bt_unregister_format(struct format *format);
+extern int bt_register_format(struct bt_format *format);
+extern void bt_unregister_format(struct bt_format *format);
 
 #ifdef __cplusplus
 }