X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=types%2Ffloat.c;h=99c2acc7c7d7fdddec96bf1073dc02516b8bf0e8;hb=2ea5cc8bf09351765d7cba940a822569dcd2c856;hp=7aeb9c3aacb5a0b7d6d0c36055e9d7575f58eb82;hpb=0d69b916c5ba44b63a26aa038d416d6ee286306b;p=babeltrace.git

diff --git a/types/float.c b/types/float.c
index 7aeb9c3a..99c2acc7 100644
--- a/types/float.c
+++ b/types/float.c
@@ -32,7 +32,7 @@
 #include <babeltrace/endian.h>
 
 static
-struct bt_definition *_float_definition_new(struct declaration *declaration,
+struct bt_definition *_float_definition_new(struct bt_declaration *declaration,
 				   struct definition_scope *parent_scope,
 				   GQuark field_name, int index,
 				   const char *root_name);
@@ -40,7 +40,7 @@ static
 void _float_definition_free(struct bt_definition *definition);
 
 static
-void _float_declaration_free(struct declaration *declaration)
+void _float_declaration_free(struct bt_declaration *declaration)
 {
 	struct declaration_float *float_declaration =
 		container_of(declaration, struct declaration_float, p);
@@ -56,7 +56,7 @@ struct declaration_float *
 		       size_t exp_len, int byte_order, size_t alignment)
 {
 	struct declaration_float *float_declaration;
-	struct declaration *declaration;
+	struct bt_declaration *declaration;
 
 	float_declaration = g_new(struct declaration_float, 1);
 	declaration = &float_declaration->p;
@@ -82,7 +82,7 @@ struct declaration_float *
 
 static
 struct bt_definition *
-	_float_definition_new(struct declaration *declaration,
+	_float_definition_new(struct bt_declaration *declaration,
 			      struct definition_scope *parent_scope,
 			      GQuark field_name, int index,
 			      const char *root_name)
@@ -100,23 +100,23 @@ struct bt_definition *
 	_float->p.path = bt_new_definition_path(parent_scope, field_name, root_name);
 	if (float_declaration->byte_order == LITTLE_ENDIAN) {
 		tmp = float_declaration->mantissa->p.definition_new(&float_declaration->mantissa->p,
-			_float->p.scope, g_quark_from_static_string("mantissa"), 0, NULL);
+			_float->p.scope, g_quark_from_string("mantissa"), 0, NULL);
 		_float->mantissa = container_of(tmp, struct definition_integer, p);
 		tmp = float_declaration->exp->p.definition_new(&float_declaration->exp->p,
-			_float->p.scope, g_quark_from_static_string("exp"), 1, NULL);
+			_float->p.scope, g_quark_from_string("exp"), 1, NULL);
 		_float->exp = container_of(tmp, struct definition_integer, p);
 		tmp = float_declaration->sign->p.definition_new(&float_declaration->sign->p,
-			_float->p.scope, g_quark_from_static_string("sign"), 2, NULL);
+			_float->p.scope, g_quark_from_string("sign"), 2, NULL);
 		_float->sign = container_of(tmp, struct definition_integer, p);
 	} else {
 		tmp = float_declaration->sign->p.definition_new(&float_declaration->sign->p,
-			_float->p.scope, g_quark_from_static_string("sign"), 0, NULL);
+			_float->p.scope, g_quark_from_string("sign"), 0, NULL);
 		_float->sign = container_of(tmp, struct definition_integer, p);
 		tmp = float_declaration->exp->p.definition_new(&float_declaration->exp->p,
-			_float->p.scope, g_quark_from_static_string("exp"), 1, NULL);
+			_float->p.scope, g_quark_from_string("exp"), 1, NULL);
 		_float->exp = container_of(tmp, struct definition_integer, p);
 		tmp = float_declaration->mantissa->p.definition_new(&float_declaration->mantissa->p,
-			_float->p.scope, g_quark_from_static_string("mantissa"), 2, NULL);
+			_float->p.scope, g_quark_from_string("mantissa"), 2, NULL);
 		_float->mantissa = container_of(tmp, struct definition_integer, p);
 	}
 	_float->p.ref = 1;