X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace2%2Ftrace-ir%2Fpacket.h;h=07b92b7c5b05677f1abf1932f086497631ae0816;hp=17c4e3777addc740daaeaa3d197ad553938cdee6;hb=d24d56638469189904fb6ddbb3c725817b3e9417;hpb=15caa1ca4fac30bd196602bd136e48fda3892de2

diff --git a/include/babeltrace2/trace-ir/packet.h b/include/babeltrace2/trace-ir/packet.h
index 17c4e377..07b92b7c 100644
--- a/include/babeltrace2/trace-ir/packet.h
+++ b/include/babeltrace2/trace-ir/packet.h
@@ -26,13 +26,15 @@
  * http://www.efficios.com/ctf
  */
 
+#include <stdint.h>
+
 /* For bt_packet, bt_packet_context_field, bt_stream */
 #include <babeltrace2/types.h>
 
-/* For bt_packet_status */
-#include <babeltrace2/trace-ir/packet-const.h>
-
-#include <stdint.h>
+/* For __BT_FUNC_STATUS_* */
+#define __BT_FUNC_STATUS_ENABLE
+#include <babeltrace2/func-status.h>
+#undef __BT_FUNC_STATUS_ENABLE
 
 #ifdef __cplusplus
 extern "C" {
@@ -45,12 +47,18 @@ 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
 
+#include <babeltrace2/undef-func-status.h>
+
 #endif /* BABELTRACE_TRACE_IR_PACKET_H */