From: Julien Desfossez <jdesfossez@efficios.com>
Date: Fri, 7 Feb 2014 19:20:02 +0000 (-0500)
Subject: sync babeltrace headers
X-Git-Tag: v0.3~60
X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=commitdiff_plain;h=e7c77239c7add21d08e81916353c2a09b59c9c4e

sync babeltrace headers

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
---

diff --git a/lib/babeltrace/ctf/events-internal.h b/lib/babeltrace/ctf/events-internal.h
index acc7562..be111c1 100644
--- a/lib/babeltrace/ctf/events-internal.h
+++ b/lib/babeltrace/ctf/events-internal.h
@@ -38,7 +38,6 @@
 #include <glib.h>
 
 struct ctf_stream_definition;
-struct ctf_file_stream;
 
 /*
  * These structures are public mappings to internal ctf_event structures.
@@ -82,7 +81,5 @@ struct bt_ctf_iter {
 
 void ctf_print_discarded(FILE *fp, struct ctf_stream_definition *stream,
 			int end_stream);
-void compute_discarded_events(struct ctf_file_stream *file_stream,
-		struct ctf_stream_pos *pos);
 
 #endif /*_BABELTRACE_CTF_EVENTS_INTERNAL_H */
diff --git a/lib/babeltrace/iterator-internal.h b/lib/babeltrace/iterator-internal.h
index 2b0b2f2..d0cc287 100644
--- a/lib/babeltrace/iterator-internal.h
+++ b/lib/babeltrace/iterator-internal.h
@@ -67,5 +67,7 @@ int bt_iter_init(struct bt_iter *iter,
 		const struct bt_iter_pos *begin_pos,
 		const struct bt_iter_pos *end_pos);
 void bt_iter_fini(struct bt_iter *iter);
+int bt_iter_add_trace(struct bt_iter *iter,
+		struct bt_trace_descriptor *td_read);
 
 #endif /* _BABELTRACE_ITERATOR_INTERNAL_H */