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 acc756258f094133c5ea06e8e54dc7a88137d1f2..be111c1710144a86056cb6441ab8357a2a31ba65 100644 (file)
--- 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;
 #include <glib.h>
 
 struct ctf_stream_definition;

-struct ctf_file_stream;

 
 /*
  * These structures are public mappings to internal ctf_event structures.
 
 /*
  * 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 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 */
 
 #endif /*_BABELTRACE_CTF_EVENTS_INTERNAL_H */

diff --git a/lib/babeltrace/iterator-internal.h b/lib/babeltrace/iterator-internal.h
index 2b0b2f23c2b5460b55ce86e9b5ad78a7c15af0a2..d0cc2877586fe213510d45ac8390251b27ddb8ad 100644 (file)
--- 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);
                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 */
 
 #endif /* _BABELTRACE_ITERATOR_INTERNAL_H */