X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Ffield-types-internal.h;h=2b860405225f9502d58db8b90cfc5195f98bb86f;hb=c55a9f585da53ea54ac458155fac3cdec1779d47;hp=dcb5b12ab3211963460b2b38752e86c8aaa9f3c2;hpb=dc3fffef7b84cc4af1a7c99828fd57a106cd2257;p=babeltrace.git

diff --git a/include/babeltrace/ctf-ir/field-types-internal.h b/include/babeltrace/ctf-ir/field-types-internal.h
index dcb5b12a..2b860405 100644
--- a/include/babeltrace/ctf-ir/field-types-internal.h
+++ b/include/babeltrace/ctf-ir/field-types-internal.h
@@ -27,6 +27,7 @@
  * SOFTWARE.
  */
 
+#include <stdint.h>
 #include <babeltrace/ctf-writer/event-types.h>
 #include <babeltrace/ctf-writer/event-fields.h>
 #include <babeltrace/ctf-writer/writer.h>
@@ -34,6 +35,7 @@
 #include <babeltrace/ctf-ir/clock-class.h>
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/object-internal.h>
+#include <babeltrace/types.h>
 #include <glib.h>
 
 typedef void (*type_freeze_func)(struct bt_ctf_field_type *);
@@ -42,7 +44,7 @@ typedef int (*type_serialize_func)(struct bt_ctf_field_type *,
 
 struct bt_ctf_field_type {
 	struct bt_object base;
-	enum bt_ctf_type_id id;
+	enum bt_ctf_field_type_id id;
 	unsigned int alignment;
 	type_freeze_func freeze;
 	type_serialize_func serialize;
@@ -64,7 +66,7 @@ struct bt_ctf_field_type_integer {
 	struct bt_ctf_field_type parent;
 	struct bt_ctf_clock_class *mapped_clock;
 	enum bt_ctf_byte_order user_byte_order;
-	bool is_signed;
+	bt_bool is_signed;
 	unsigned int size;
 	enum bt_ctf_integer_base base;
 	enum bt_ctf_string_encoding encoding;
@@ -88,7 +90,7 @@ struct bt_ctf_field_type_enumeration {
 	struct bt_ctf_field_type *container;
 	GPtrArray *entries; /* Array of ptrs to struct enumeration_mapping */
 	/* Only set during validation. */
-	bool has_overlapping_ranges;
+	bt_bool has_overlapping_ranges;
 };
 
 enum bt_ctf_field_type_enumeration_mapping_iterator_type {
@@ -214,7 +216,7 @@ int bt_ctf_field_type_sequence_set_element_type(struct bt_ctf_field_type *array,
 		struct bt_ctf_field_type *element_type);
 
 BT_HIDDEN
-int bt_ctf_field_type_get_field_count(struct bt_ctf_field_type *type);
+int64_t bt_ctf_field_type_get_field_count(struct bt_ctf_field_type *type);
 
 BT_HIDDEN
 struct bt_ctf_field_type *bt_ctf_field_type_get_field_at_index(