X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctf-writer%2Ffield-types.h;h=7fe846382e999dc60364129b40f34d966bdc82c9;hb=f3847c753f1b4f12353c38d97b0577d9993d19fb;hp=89fbf97ed7b35ed23f8a608e4fe60c81f96f6bce;hpb=85e7137bc3a69800efca39a38eea8deb4816d4a9;p=babeltrace.git

diff --git a/src/ctf-writer/field-types.h b/src/ctf-writer/field-types.h
index 89fbf97e..7fe84638 100644
--- a/src/ctf-writer/field-types.h
+++ b/src/ctf-writer/field-types.h
@@ -31,8 +31,8 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include <babeltrace2/ctf-writer/field-types.h>
-#include <babeltrace2/types.h>
+#include <babeltrace2-ctf-writer/field-types.h>
+#include <babeltrace2-ctf-writer/types.h>
 
 #include "common/macros.h"
 
@@ -135,7 +135,7 @@ struct bt_ctf_field_type_common_integer {
 	struct bt_ctf_clock_class *mapped_clock_class;
 
 	enum bt_ctf_byte_order user_byte_order;
-	bt_bool is_signed;
+	bt_ctf_bool is_signed;
 	unsigned int size;
 	enum bt_ctf_integer_base base;
 	enum bt_ctf_string_encoding encoding;
@@ -163,7 +163,7 @@ struct bt_ctf_field_type_common_enumeration {
 	GPtrArray *entries;
 
 	/* Only set during validation */
-	bt_bool has_overlapping_ranges;
+	bt_ctf_bool has_overlapping_ranges;
 };
 
 enum bt_ctf_field_type_enumeration_mapping_iterator_type {
@@ -394,11 +394,11 @@ BT_HIDDEN
 int bt_ctf_field_type_common_integer_get_size(struct bt_ctf_field_type_common *ft);
 
 BT_HIDDEN
-bt_bool bt_ctf_field_type_common_integer_is_signed(struct bt_ctf_field_type_common *ft);
+bt_ctf_bool bt_ctf_field_type_common_integer_is_signed(struct bt_ctf_field_type_common *ft);
 
 BT_HIDDEN
 int bt_ctf_field_type_common_integer_set_is_signed(struct bt_ctf_field_type_common *ft,
-		bt_bool is_signed);
+		bt_ctf_bool is_signed);
 
 BT_HIDDEN
 int bt_ctf_field_type_common_integer_set_size(struct bt_ctf_field_type_common *ft,
@@ -449,6 +449,22 @@ struct bt_ctf_field_type_enumeration_mapping_iterator *
 bt_ctf_field_type_common_enumeration_unsigned_find_mappings_by_value(
 		struct bt_ctf_field_type_common *ft, uint64_t value);
 
+BT_HIDDEN
+int bt_ctf_field_type_enumeration_mapping_iterator_next(
+		struct bt_ctf_field_type_enumeration_mapping_iterator *iter);
+
+BT_HIDDEN
+int bt_ctf_field_type_enumeration_mapping_iterator_signed_get(
+		struct bt_ctf_field_type_enumeration_mapping_iterator *iter,
+		const char **mapping_name, int64_t *range_begin,
+		int64_t *range_end);
+
+BT_HIDDEN
+int bt_ctf_field_type_enumeration_mapping_iterator_unsigned_get(
+		struct bt_ctf_field_type_enumeration_mapping_iterator *iter,
+		const char **mapping_name, uint64_t *range_begin,
+		uint64_t *range_end);
+
 BT_HIDDEN
 int bt_ctf_field_type_common_enumeration_signed_get_mapping_by_index(
 		struct bt_ctf_field_type_common *ft, uint64_t index,