X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fstruct.c;h=f360407c46f3ed956285689ae3847c9b5d01625a;hp=a9703b28e4859a00f59f59894c2a0a37762c0305;hb=f133896d405417ba90ac250d243d4b8e539e98f1;hpb=98df1c9fb24d5e7e10bf628692011e130e0d8339

diff --git a/types/struct.c b/types/struct.c
index a9703b28..f360407c 100644
--- a/types/struct.c
+++ b/types/struct.c
@@ -3,7 +3,9 @@
  *
  * BabelTrace - Structure Type Converter
  *
- * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -18,6 +20,7 @@
 
 #include <babeltrace/compiler.h>
 #include <babeltrace/format.h>
+#include <babeltrace/types.h>
 #include <errno.h>
 
 #ifndef max
@@ -118,7 +121,7 @@ struct definition *
 	_struct->p.index = root_name ? INT_MAX : index;
 	_struct->p.name = field_name;
 	_struct->p.path = new_definition_path(parent_scope, field_name, root_name);
-	_struct->scope = new_definition_scope(parent_scope, field_name, root_name);
+	_struct->p.scope = new_definition_scope(parent_scope, field_name, root_name);
 
 	ret = register_field_definition(field_name, &_struct->p,
 					parent_scope);
@@ -134,7 +137,7 @@ struct definition *
 			(struct definition **) &g_ptr_array_index(_struct->fields, i);
 
 		*field = declaration_field->declaration->definition_new(declaration_field->declaration,
-							  _struct->scope,
+							  _struct->p.scope,
 							  declaration_field->name, i, NULL);
 		if (!*field)
 			goto error;
@@ -146,7 +149,7 @@ error:
 		struct definition *field = g_ptr_array_index(_struct->fields, i);
 		definition_unref(field);
 	}
-	free_definition_scope(_struct->scope);
+	free_definition_scope(_struct->p.scope);
 	declaration_unref(&struct_declaration->p);
 	g_free(_struct);
 	return NULL;
@@ -164,7 +167,7 @@ void _struct_definition_free(struct definition *definition)
 		struct definition *field = g_ptr_array_index(_struct->fields, i);
 		definition_unref(field);
 	}
-	free_definition_scope(_struct->scope);
+	free_definition_scope(_struct->p.scope);
 	declaration_unref(_struct->p.declaration);
 	g_free(_struct);
 }