X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fpacket.c;h=d32da65a8a155bd176309168ddc2dd6317c6c9ba;hb=d24d56638469189904fb6ddbb3c725817b3e9417;hp=6aeb2b89ecb2255c678aba8e79679e6233784e37;hpb=350ad6c1c5f45a4e90c33e3c1354125c209bbf02;p=babeltrace.git

diff --git a/src/lib/trace-ir/packet.c b/src/lib/trace-ir/packet.c
index 6aeb2b89..d32da65a 100644
--- a/src/lib/trace-ir/packet.c
+++ b/src/lib/trace-ir/packet.c
@@ -21,7 +21,7 @@
  */
 
 #define BT_LOG_TAG "LIB/PACKET"
-#include "lib/lib-logging.h"
+#include "lib/logging.h"
 
 #include "lib/assert-pre.h"
 #include <babeltrace2/trace-ir/packet-const.h>
@@ -39,6 +39,7 @@
 #include "stream-class.h"
 #include "stream.h"
 #include "trace.h"
+#include "lib/func-status.h"
 
 #define BT_ASSERT_PRE_PACKET_HOT(_packet) \
 	BT_ASSERT_PRE_HOT((_packet), "Packet", ": %!+a", (_packet))
@@ -236,7 +237,8 @@ end:
 	return (void *) packet;
 }
 
-enum bt_packet_status bt_packet_move_context_field(struct bt_packet *packet,
+enum bt_packet_move_context_field_status bt_packet_move_context_field(
+		struct bt_packet *packet,
 		struct bt_packet_context_field *context_field)
 {
 	struct bt_stream_class *stream_class;
@@ -261,7 +263,7 @@ enum bt_packet_status bt_packet_move_context_field(struct bt_packet *packet,
 
 	/* Move new field */
 	packet->context_field = field_wrapper;
-	return BT_PACKET_STATUS_OK;
+	return BT_FUNC_STATUS_OK;
 }
 
 void bt_packet_get_ref(const struct bt_packet *packet)