X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Fgraph%2Fport-output-message-iterator.h;h=04bed3dcffc49952032bc771cf0e2e1c7993dabe;hb=4fa90f321f51af8f5bfc48eee1435e2f41d853b3;hp=ebbd2e5090ac2a5897abb80b59a10356c6730bda;hpb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;p=babeltrace.git

diff --git a/include/babeltrace2/graph/port-output-message-iterator.h b/include/babeltrace2/graph/port-output-message-iterator.h
index ebbd2e50..04bed3dc 100644
--- a/include/babeltrace2/graph/port-output-message-iterator.h
+++ b/include/babeltrace2/graph/port-output-message-iterator.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_GRAPH_PORT_OUTPUT_MESSAGE_ITERATOR_H
-#define BABELTRACE_GRAPH_PORT_OUTPUT_MESSAGE_ITERATOR_H
+#ifndef BABELTRACE2_GRAPH_PORT_OUTPUT_MESSAGE_ITERATOR_H
+#define BABELTRACE2_GRAPH_PORT_OUTPUT_MESSAGE_ITERATOR_H
 
 /*
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
@@ -23,10 +23,14 @@
  * SOFTWARE.
  */
 
+#ifndef __BT_IN_BABELTRACE_H
+# error "Please include <babeltrace2/babeltrace.h> instead."
+#endif
+
 #include <stdint.h>
 
-/* For bt_message_iterator_status */
-#include <babeltrace2/graph/message-iterator-const.h>
+/* For bt_message_iterator_*_status */
+#include <babeltrace2/graph/message-iterator.h>
 
 /*
  * For bt_port, bt_message, bt_message_iterator,
@@ -52,7 +56,7 @@ bt_port_output_message_iterator_create(
 		bt_graph *graph,
 		const bt_port_output *output_port);
 
-extern bt_message_iterator_status
+extern bt_message_iterator_next_status
 bt_port_output_message_iterator_next(
 		bt_port_output_message_iterator *iterator,
 		bt_message_array_const *msgs, uint64_t *count);
@@ -64,12 +68,12 @@ extern bt_bool bt_port_output_message_iterator_can_seek_ns_from_origin(
 extern bt_bool bt_port_output_message_iterator_can_seek_beginning(
 		bt_port_output_message_iterator *iterator);
 
-extern bt_message_iterator_status
+extern bt_message_iterator_seek_ns_from_origin_status
 bt_port_output_message_iterator_seek_ns_from_origin(
 		bt_port_output_message_iterator *iterator,
 		int64_t ns_from_origin);
 
-extern bt_message_iterator_status
+extern bt_message_iterator_seek_beginning_status
 bt_port_output_message_iterator_seek_beginning(
 		bt_port_output_message_iterator *iterator);
 
@@ -96,4 +100,4 @@ extern void bt_port_output_message_iterator_put_ref(
 }
 #endif
 
-#endif /* BABELTRACE_GRAPH_PORT_OUTPUT_MESSAGE_ITERATOR_H */
+#endif /* BABELTRACE2_GRAPH_PORT_OUTPUT_MESSAGE_ITERATOR_H */