lib: standardize public include guards

[babeltrace.git] / include / babeltrace2 / graph / self-message-iterator.h

diff --git a/include/babeltrace2/graph/self-message-iterator.h b/include/babeltrace2/graph/self-message-iterator.h
index 0ff3c0d3eab235b8a435a2f9bd0248ff15a27663..d33ca4e725ed96952a44b766c833041d9fe9eb4a 100644 (file)
--- a/include/babeltrace2/graph/self-message-iterator.h
+++ b/include/babeltrace2/graph/self-message-iterator.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_GRAPH_SELF_MESSAGE_ITERATOR_H
-#define BABELTRACE_GRAPH_SELF_MESSAGE_ITERATOR_H
+#ifndef BABELTRACE2_GRAPH_SELF_MESSAGE_ITERATOR_H
+#define BABELTRACE2_GRAPH_SELF_MESSAGE_ITERATOR_H
 
 /*
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
@@ -23,9 +23,6 @@
  * SOFTWARE.
  */
 
-/* For BT_MESSAGE_ITERATOR_STATUS_* */
-#include <babeltrace2/graph/message-iterator-const.h>
-
 /* For bt_self_component, bt_self_message_iterator, bt_self_port_output */
 #include <babeltrace2/types.h>
 
@@ -33,14 +30,6 @@
 extern "C" {
 #endif
 
-typedef enum bt_self_message_iterator_status {
-       BT_SELF_MESSAGE_ITERATOR_STATUS_OK = BT_MESSAGE_ITERATOR_STATUS_OK,
-       BT_SELF_MESSAGE_ITERATOR_STATUS_END = BT_MESSAGE_ITERATOR_STATUS_END,
-       BT_SELF_MESSAGE_ITERATOR_STATUS_AGAIN = BT_MESSAGE_ITERATOR_STATUS_AGAIN,
-       BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR = BT_MESSAGE_ITERATOR_STATUS_ERROR,
-       BT_SELF_MESSAGE_ITERATOR_STATUS_NOMEM = BT_MESSAGE_ITERATOR_STATUS_NOMEM,
-} bt_self_message_iterator_status;
-
 extern bt_self_component *
 bt_self_message_iterator_borrow_component(
                bt_self_message_iterator *message_iterator);
@@ -60,4 +49,4 @@ extern void *bt_self_message_iterator_get_data(
 }
 #endif
 
-#endif /* BABELTRACE_GRAPH_SELF_MESSAGE_ITERATOR_H */
+#endif /* BABELTRACE2_GRAPH_SELF_MESSAGE_ITERATOR_H */