- Several warning fixes

[libfirm] / ir / common / statistics.c

diff --git a/ir/common/statistics.c b/ir/common/statistics.c
index 6e24ec9..276d605 100644 (file)
--- a/ir/common/statistics.c
+++ b/ir/common/statistics.c
@@ -10,9 +10,13 @@
  * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "statistics.h"
-#include "irgraph.h"
-#include "irnode.h"
+#include "irgraph_t.h"
+#include "irnode_t.h"
 #include "irprog.h"
 #include "irgwalk.h"
 
@@ -29,10 +33,10 @@ static void count_nodes(ir_node *n, void *env) {
  *  totals. */
 void print_graph_counts(int verbosity) {
   int i, counter, total = 0;
-  int view = interprocedural_view;
+  int view = get_interprocedural_view();
   ir_graph *old = current_ir_graph;
 
-  interprocedural_view = 0;
+  set_interprocedural_view(0);
 
   for (i = 0; i < get_irp_n_irgs(); i++) {
     counter = 0;
@@ -44,7 +48,7 @@ void print_graph_counts(int verbosity) {
   printf(" +++ There are %d graphs with total %d nodes.\n", get_irp_n_irgs(), total);
 
   current_ir_graph = old;
-  interprocedural_view = view;
+  set_interprocedural_view(view);
 }
 
 /** Prints number of types, number of entities and totals.
@@ -52,11 +56,11 @@ void print_graph_counts(int verbosity) {
 void print_type_counts(int verbosity) {
   int i, counter, total = 0;
   for (i = 0; i < get_irp_n_types(); i++) {
-    type *tp = get_irp_type(i);
+    ir_type *tp = get_irp_type(i);
     counter = -1;
-    if (is_class_type(tp)) counter = get_class_n_members(tp);
-    if (is_struct_type(tp)) counter = get_struct_n_members(tp);
-    if (is_union_type(tp)) counter = get_union_n_members(tp);
+    if (is_Class_type(tp)) counter = get_class_n_members(tp);
+    if (is_Struct_type(tp)) counter = get_struct_n_members(tp);
+    if (is_Union_type(tp)) counter = get_union_n_members(tp);
     if (counter > -1) {
       if (verbosity == 1)
     printf(" +%3d entities in %s type %s.\n", counter, get_type_tpop_name(tp), get_type_name(tp));