include/babeltrace/graph: fix some include guards

[babeltrace.git] / include / babeltrace / graph / notification-packet-internal.h

diff --git a/include/babeltrace/graph/notification-packet-internal.h b/include/babeltrace/graph/notification-packet-internal.h
index 4d519544f289a1642a7c80cade6f12809042f026..1c5917514c687c3fc2c742cfe8865de9eddfe00a 100644 (file)
--- a/include/babeltrace/graph/notification-packet-internal.h
+++ b/include/babeltrace/graph/notification-packet-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_NOTIFICATION_PACKET_INTERNAL_H
-#define BABELTRACE_COMPONENT_NOTIFICATION_PACKET_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_NOTIFICATION_PACKET_INTERNAL_H
+#define BABELTRACE_GRAPH_NOTIFICATION_PACKET_INTERNAL_H
 
 /*
  * BabelTrace - Packet-related Notifications
@@ -30,39 +30,40 @@
 #include <babeltrace/compiler-internal.h>
 #include <babeltrace/ctf-ir/packet.h>
 #include <babeltrace/graph/notification-internal.h>
+#include <babeltrace/assert-internal.h>
 
 struct bt_notification_packet_begin {
        struct bt_notification parent;
-       struct bt_ctf_packet *packet;
+       struct bt_packet *packet;
 };
 
 struct bt_notification_packet_end {
        struct bt_notification parent;
-       struct bt_ctf_packet *packet;
+       struct bt_packet *packet;
 };
 
 static inline
-struct bt_ctf_packet *bt_notification_packet_begin_borrow_packet(
+struct bt_packet *bt_notification_packet_begin_borrow_packet(
                struct bt_notification *notif)
 {
        struct bt_notification_packet_begin *notif_packet_begin =
                container_of(notif,
                        struct bt_notification_packet_begin, parent);
 
-       assert(notif_packet_begin);
+       BT_ASSERT(notif_packet_begin);
        return notif_packet_begin->packet;
 }
 
 static inline
-struct bt_ctf_packet *bt_notification_packet_end_borrow_packet(
+struct bt_packet *bt_notification_packet_end_borrow_packet(
                struct bt_notification *notif)
 {
        struct bt_notification_packet_end *notif_packet_end =
                container_of(notif,
                        struct bt_notification_packet_end, parent);
 
-       assert(notif_packet_end);
+       BT_ASSERT(notif_packet_end);
        return notif_packet_end->packet;
 }
 
-#endif /* BABELTRACE_COMPONENT_NOTIFICATION_PACKET_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_NOTIFICATION_PACKET_INTERNAL_H */