X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fstruct.c;h=2a3fa4c5366c4c5730f988edb9cc74e2a812ed7a;hp=729c456e63c5769663ce720fadf7aa7a2b7e0ccb;hb=46322b331aefc5739efd841df72d1928e35050e6;hpb=11796b9629d5a870163e4edd67e457576553aaef

diff --git a/formats/ctf/types/struct.c b/formats/ctf/types/struct.c
index 729c456e..2a3fa4c5 100644
--- a/formats/ctf/types/struct.c
+++ b/formats/ctf/types/struct.c
@@ -3,33 +3,30 @@
  *
  * Structure format access functions.
  *
- * Copyright (c) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  */
 
 #include <babeltrace/ctf/types.h>
-#include <glib.h>
 
-void ctf_struct_begin(struct stream_pos *pos,
-		      const struct type_class_struct *struct_class)
+void ctf_struct_begin(struct stream_pos *ppos,
+		      const struct declaration_struct *struct_declaration)
 {
-	align_pos(pos, struct_class->p.alignment);
+	struct ctf_stream_pos *pos = ctf_pos(ppos);
+
+	ctf_align_pos(pos, struct_declaration->p.alignment);
 }
 
-void ctf_struct_end(struct stream_pos *pos,
-		    const struct type_class_struct *struct_class)
+void ctf_struct_end(struct stream_pos *ppos,
+		    const struct declaration_struct *struct_declaration)
 {
 }