ir: split event files into event and event-class files

[babeltrace.git] / formats / ctf / ir / stream-class.c

diff --git a/formats/ctf/ir/stream-class.c b/formats/ctf/ir/stream-class.c
index b5e7e79dca12b2f7330a68ee838101a1da6f4b89..326e759e23d926769267739a9118af7c95c49bde 100644 (file)
--- a/formats/ctf/ir/stream-class.c
+++ b/formats/ctf/ir/stream-class.c
@@ -29,9 +29,10 @@
 #include <babeltrace/ctf-writer/clock.h>
 #include <babeltrace/ctf-ir/clock-internal.h>
 #include <babeltrace/ctf-writer/event.h>
+#include <babeltrace/ctf-ir/event-class-internal.h>
 #include <babeltrace/ctf-ir/event-internal.h>
-#include <babeltrace/ctf-ir/event-types-internal.h>
-#include <babeltrace/ctf-ir/event-fields-internal.h>
+#include <babeltrace/ctf-ir/field-types-internal.h>
+#include <babeltrace/ctf-ir/fields-internal.h>
 #include <babeltrace/ctf-writer/stream.h>
 #include <babeltrace/ctf-ir/stream-class-internal.h>
 #include <babeltrace/ctf-ir/validation-internal.h>
@@ -587,7 +588,7 @@ int bt_ctf_stream_class_set_packet_context_type(
                goto end;
        }
        if (bt_ctf_field_type_get_type_id(packet_context_type) !=
-               CTF_TYPE_STRUCT) {
+               BT_CTF_TYPE_ID_STRUCT) {
                /* A packet context must be a structure */
                ret = -1;
                goto end;
@@ -632,7 +633,7 @@ int bt_ctf_stream_class_set_event_header_type(
                goto end;
        }
        if (bt_ctf_field_type_get_type_id(event_header_type) !=
-               CTF_TYPE_STRUCT) {
+               BT_CTF_TYPE_ID_STRUCT) {
                /* An event header must be a structure */
                ret = -1;
                goto end;
@@ -673,7 +674,7 @@ int bt_ctf_stream_class_set_event_context_type(
        }
 
        if (bt_ctf_field_type_get_type_id(event_context_type) !=
-               CTF_TYPE_STRUCT) {
+               BT_CTF_TYPE_ID_STRUCT) {
                /* A packet context must be a structure */
                ret = -1;
                goto end;