Python build fix

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

diff --git a/formats/ctf/ir/stream.c b/formats/ctf/ir/stream.c
index 56abfcea5f89fe1f78f47241428fcc20d3688361..44cfb8bb8f8dcf50a5d8c4b97ff28e7047ea40a4 100644 (file)
--- a/formats/ctf/ir/stream.c
+++ b/formats/ctf/ir/stream.c
@@ -32,7 +32,6 @@
 #include <babeltrace/ctf-ir/event-internal.h>
 #include <babeltrace/ctf-ir/field-types-internal.h>
 #include <babeltrace/ctf-ir/fields-internal.h>
-#include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/ctf-ir/stream-internal.h>
 #include <babeltrace/ctf-ir/stream-class-internal.h>
 #include <babeltrace/ctf-ir/trace-internal.h>
@@ -70,7 +69,7 @@ int set_packet_header_magic(struct bt_ctf_stream *stream)
        assert(magic_field_type);
 
        if (bt_ctf_field_type_get_type_id(magic_field_type) !=
-               BT_CTF_TYPE_ID_INTEGER) {
+               CTF_TYPE_INTEGER) {
                /* Magic field is not an integer. Not an error, skip. */
                goto end;
        }
@@ -121,7 +120,7 @@ int set_packet_header_uuid(struct bt_ctf_stream *stream)
        uuid_field_type = bt_ctf_field_get_type(uuid_field);
        assert(uuid_field_type);
        if (bt_ctf_field_type_get_type_id(uuid_field_type) !=
-               BT_CTF_TYPE_ID_ARRAY) {
+               CTF_TYPE_ARRAY) {
                /* UUID field is not an array. Not an error, skip. */
                goto end;
        }
@@ -138,7 +137,7 @@ int set_packet_header_uuid(struct bt_ctf_stream *stream)
                uuid_field_type);
        assert(element_field_type);
        if (bt_ctf_field_type_get_type_id(element_field_type) !=
-               BT_CTF_TYPE_ID_INTEGER) {
+               CTF_TYPE_INTEGER) {
                /* UUID array elements are not integers. Not an error, skip */
                goto end;
        }
@@ -194,7 +193,7 @@ int set_packet_header_stream_id(struct bt_ctf_stream *stream)
        stream_id_field_type = bt_ctf_field_get_type(stream_id_field);
        assert(stream_id_field_type);
        if (bt_ctf_field_type_get_type_id(stream_id_field_type) !=
-               BT_CTF_TYPE_ID_INTEGER) {
+               CTF_TYPE_INTEGER) {
                /* stream_id field is not an integer. Not an error, skip. */
                goto end;
        }
@@ -633,6 +632,7 @@ end:
        return packet_context;
 }
 
+BT_HIDDEN
 int bt_ctf_stream_set_packet_context(struct bt_ctf_stream *stream,
                struct bt_ctf_field *field)
 {
@@ -659,6 +659,7 @@ end:
        return ret;
 }
 
+BT_HIDDEN
 struct bt_ctf_field *bt_ctf_stream_get_packet_header(
                struct bt_ctf_stream *stream)
 {
@@ -676,6 +677,7 @@ end:
        return packet_header;
 }
 
+BT_HIDDEN
 int bt_ctf_stream_set_packet_header(struct bt_ctf_stream *stream,
                struct bt_ctf_field *field)
 {
@@ -721,7 +723,7 @@ int get_event_header_timestamp(struct bt_ctf_field *event_header, uint64_t *time
        timestamp_field_type = bt_ctf_field_get_type(timestamp_field);
        assert(timestamp_field_type);
        if (bt_ctf_field_type_get_type_id(timestamp_field_type) !=
-               BT_CTF_TYPE_ID_INTEGER) {
+               CTF_TYPE_INTEGER) {
                ret = -1;
                goto end;
        }
@@ -974,7 +976,7 @@ int set_structure_field_integer(struct bt_ctf_field *structure, char *name,
        field_type = bt_ctf_field_get_type(integer);
        /* Something is serioulsly wrong */
        assert(field_type);
-       if (bt_ctf_field_type_get_type_id(field_type) != BT_CTF_TYPE_ID_INTEGER) {
+       if (bt_ctf_field_type_get_type_id(field_type) != CTF_TYPE_INTEGER) {
                /*
                 * The user most likely meant for us to populate this field
                 * automatically. However, we can only do this if the field
@@ -996,6 +998,7 @@ end:
        return ret;
 }
 
+BT_HIDDEN
 const char *bt_ctf_stream_get_name(struct bt_ctf_stream *stream)
 {
        const char *name = NULL;