Fix: update missing copyrights and ifdef protection mismatch

[babeltrace.git] / formats / ctf / metadata / ctf-scanner.h

diff --git a/formats/ctf/metadata/ctf-scanner.h b/formats/ctf/metadata/ctf-scanner.h
index 07b5df7c75ac1d64201ee35587a174a39cf48212..c6b70907f6c21ec3bd6094c4285fde247afc83df 100644 (file)
--- a/formats/ctf/metadata/ctf-scanner.h
+++ b/formats/ctf/metadata/ctf-scanner.h
@@ -1,6 +1,22 @@
 #ifndef _CTF_SCANNER_H
 #define _CTF_SCANNER_H
 
+/*
+ * ctf-scanner.h
+ *
+ * Copyright 2011-2012 - 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
+ * 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:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+
 #include <stdio.h>
 #include "ctf-ast.h"
 
@@ -9,12 +25,18 @@
 typedef void* yyscan_t;
 #endif
 
+struct ctf_scanner_scope;
+struct ctf_scanner_scope {
+       struct ctf_scanner_scope *parent;
+       GHashTable *types;
+};
+
 struct ctf_scanner {
        yyscan_t scanner;
        struct ctf_ast *ast;
-       struct scope root_scope;
-       struct scope *cs;
-       struct cds_list_head allocated_strings;
+       struct ctf_scanner_scope root_scope;
+       struct ctf_scanner_scope *cs;
+       struct bt_list_head allocated_strings;
 };
 
 struct ctf_scanner *ctf_scanner_alloc(FILE *input);