X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Finteger.c;h=41dd7751febf1065cb24b407de55c7f492841c49;hp=373e4bc4af85ea068a13ddfff22a6e452409c99e;hb=e1151715912eaec959682b3bc10be3ced6abe467;hpb=de47353a173cf134d0bd50673520e243ebc29054

diff --git a/types/integer.c b/types/integer.c
index 373e4bc4..41dd7751 100644
--- a/types/integer.c
+++ b/types/integer.c
@@ -22,17 +22,17 @@
 #include <stdint.h>
 
 static
-struct declaration *_integer_declaration_new(struct type *type,
-			       struct declaration_scope *parent_scope);
+struct definition *_integer_definition_new(struct type *type,
+			       struct definition_scope *parent_scope);
 static
-void _integer_declaration_free(struct declaration *declaration);
+void _integer_definition_free(struct definition *definition);
 
 void integer_copy(struct stream_pos *dest, const struct format *fdest, 
 		  struct stream_pos *src, const struct format *fsrc,
-		  struct declaration *declaration)
+		  struct definition *definition)
 {
-	struct declaration_integer *integer =
-		container_of(declaration, struct declaration_integer, p);
+	struct definition_integer *integer =
+		container_of(definition, struct definition_integer, p);
 	struct type_integer *integer_type = integer->type;
 
 	if (!integer_type->signedness) {
@@ -68,8 +68,8 @@ struct type_integer *
 	integer_type->p.alignment = alignment;
 	integer_type->p.copy = integer_copy;
 	integer_type->p.type_free = _integer_type_free;
-	integer_type->p.declaration_free = _integer_declaration_free;
-	integer_type->p.declaration_new = _integer_declaration_new;
+	integer_type->p.definition_free = _integer_definition_free;
+	integer_type->p.definition_new = _integer_definition_new;
 	integer_type->p.ref = 1;
 	integer_type->len = len;
 	integer_type->byte_order = byte_order;
@@ -78,15 +78,15 @@ struct type_integer *
 }
 
 static
-struct declaration *
-	_integer_declaration_new(struct type *type,
-				 struct declaration_scope *parent_scope)
+struct definition *
+	_integer_definition_new(struct type *type,
+				struct definition_scope *parent_scope)
 {
 	struct type_integer *integer_type =
 		container_of(type, struct type_integer, p);
-	struct declaration_integer *integer;
+	struct definition_integer *integer;
 
-	integer = g_new(struct declaration_integer, 1);
+	integer = g_new(struct definition_integer, 1);
 	type_ref(&integer_type->p);
 	integer->p.type = type;
 	integer->type = integer_type;
@@ -96,10 +96,10 @@ struct declaration *
 }
 
 static
-void _integer_declaration_free(struct declaration *declaration)
+void _integer_definition_free(struct definition *definition)
 {
-	struct declaration_integer *integer =
-		container_of(declaration, struct declaration_integer, p);
+	struct definition_integer *integer =
+		container_of(definition, struct definition_integer, p);
 
 	type_unref(integer->p.type);
 	g_free(integer);