X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=types%2Ftypes.c;h=41c6b8ed76258992a22f580acf2c5810d0cad4e6;hb=6764ed54802782af3565686fc28ae1e17b9fa75a;hp=0d1a89d1946c0146e08ba28ffafcb09fabfa84fc;hpb=92c6a024cd3e81293bd39fd2b322e12ce57ea502;p=babeltrace.git

diff --git a/types/types.c b/types/types.c
index 0d1a89d1..41c6b8ed 100644
--- a/types/types.c
+++ b/types/types.c
@@ -31,7 +31,7 @@
 #include <babeltrace/format.h>
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/types.h>
-#include <limits.h>
+#include <babeltrace/compat/limits.h>
 #include <glib.h>
 #include <errno.h>
 
@@ -634,7 +634,7 @@ struct definition_integer *bt_lookup_integer(const struct bt_definition *definit
 	lookup = bt_lookup_definition(definition, field_name);
 	if (!lookup)
 		return NULL;
-	if (lookup->declaration->id != CTF_TYPE_INTEGER)
+	if (lookup->declaration->id != BT_CTF_TYPE_ID_INTEGER)
 		return NULL;
 	lookup_integer = container_of(lookup, struct definition_integer, p);
 	if (lookup_integer->declaration->signedness != signedness)
@@ -652,7 +652,7 @@ struct definition_enum *bt_lookup_enum(const struct bt_definition *definition,
 	lookup = bt_lookup_definition(definition, field_name);
 	if (!lookup)
 		return NULL;
-	if (lookup->declaration->id != CTF_TYPE_ENUM)
+	if (lookup->declaration->id != BT_CTF_TYPE_ID_ENUM)
 		return NULL;
 	lookup_enum = container_of(lookup, struct definition_enum, p);
 	if (lookup_enum->integer->declaration->signedness != signedness)
@@ -669,7 +669,7 @@ struct bt_definition *bt_lookup_variant(const struct bt_definition *definition,
 	lookup = bt_lookup_definition(definition, field_name);
 	if (!lookup)
 		return NULL;
-	if (lookup->declaration->id != CTF_TYPE_VARIANT)
+	if (lookup->declaration->id != BT_CTF_TYPE_ID_VARIANT)
 		return NULL;
 	bt_lookup_variant = container_of(lookup, struct definition_variant, p);
 	lookup = bt_variant_get_current_field(bt_lookup_variant);