X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=types%2Ftypes.c;h=ade23e5ef0440555703d81ec44e4afee44eb2598;hb=8099326b3438eb003bf3f9849ad1b3cd1f0d618c;hp=b235c13ae51bc254c9d1210676a4761917622a07;hpb=0d69b916c5ba44b63a26aa038d416d6ee286306b;p=babeltrace.git

diff --git a/types/types.c b/types/types.c
index b235c13a..ade23e5e 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>
 
@@ -51,7 +51,7 @@ GQuark prefix_quark(const char *prefix, GQuark quark)
 }
 
 static
-struct declaration *
+struct bt_declaration *
 	bt_lookup_declaration_scope(GQuark declaration_name,
 		struct declaration_scope *scope)
 {
@@ -59,10 +59,10 @@ struct declaration *
 				   (gconstpointer) (unsigned long) declaration_name);
 }
 
-struct declaration *bt_lookup_declaration(GQuark declaration_name,
+struct bt_declaration *bt_lookup_declaration(GQuark declaration_name,
 		struct declaration_scope *scope)
 {
-	struct declaration *declaration;
+	struct bt_declaration *declaration;
 
 	while (scope) {
 		declaration = bt_lookup_declaration_scope(declaration_name,
@@ -74,7 +74,7 @@ struct declaration *bt_lookup_declaration(GQuark declaration_name,
 	return NULL;
 }
 
-int bt_register_declaration(GQuark name, struct declaration *declaration,
+int bt_register_declaration(GQuark name, struct bt_declaration *declaration,
 		struct declaration_scope *scope)
 {
 	if (!name)
@@ -279,12 +279,12 @@ int bt_register_field_definition(GQuark field_name, struct bt_definition *defini
 	return 0;
 }
 
-void bt_declaration_ref(struct declaration *declaration)
+void bt_declaration_ref(struct bt_declaration *declaration)
 {
 	declaration->ref++;
 }
 
-void bt_declaration_unref(struct declaration *declaration)
+void bt_declaration_unref(struct bt_declaration *declaration)
 {
 	if (!declaration)
 		return;