lib: force user to include `<babeltrace2/babeltrace.h>`

[babeltrace.git] / include / babeltrace2 / trace-ir / packet.h

diff --git a/include/babeltrace2/trace-ir/packet.h b/include/babeltrace2/trace-ir/packet.h
index 17c4e3777addc740daaeaa3d197ad553938cdee6..bc45a4eb3b45d0d305a6ebb65d6f8658dea2bb75 100644 (file)
--- a/include/babeltrace2/trace-ir/packet.h
+++ b/include/babeltrace2/trace-ir/packet.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_TRACE_IR_PACKET_H
-#define BABELTRACE_TRACE_IR_PACKET_H
+#ifndef BABELTRACE2_TRACE_IR_PACKET_H
+#define BABELTRACE2_TRACE_IR_PACKET_H
 
 /*
  * Copyright 2016-2018 Philippe Proulx <pproulx@efficios.com>
@@ -26,14 +26,15 @@
  * http://www.efficios.com/ctf
  */
 
-/* For bt_packet, bt_packet_context_field, bt_stream */
-#include <babeltrace2/types.h>
-
-/* For bt_packet_status */
-#include <babeltrace2/trace-ir/packet-const.h>
+#ifndef __BT_IN_BABELTRACE_H
+# error "Please include <babeltrace2/babeltrace.h> instead."
+#endif
 
 #include <stdint.h>
 
+/* For bt_packet, bt_packet_context_field, bt_stream */
+#include <babeltrace2/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -45,12 +46,16 @@ extern bt_stream *bt_packet_borrow_stream(bt_packet *packet);
 extern
 bt_field *bt_packet_borrow_context_field(bt_packet *packet);
 
+typedef enum bt_packet_move_context_field_status {
+       BT_PACKET_MOVE_CONTEXT_FIELD_STATUS_OK  = __BT_FUNC_STATUS_OK,
+} bt_packet_move_context_field_status;
+
 extern
-bt_packet_status bt_packet_move_context_field(bt_packet *packet,
-               bt_packet_context_field *context);
+bt_packet_move_context_field_status bt_packet_move_context_field(
+               bt_packet *packet, bt_packet_context_field *context);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* BABELTRACE_TRACE_IR_PACKET_H */
+#endif /* BABELTRACE2_TRACE_IR_PACKET_H */