X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firextbb.c;h=71506c1649c717e381d8c33cac63163d0e65caa6;hb=e775a978fff2841e0722c47f13545b54d48b8f98;hp=0e1a17ec5ab220ddc90f8200ea7bee98d4db3357;hpb=1a26f4853c07d1ecd68a097409dd602edfe29eff;p=libfirm

diff --git a/ir/ana/irextbb.c b/ir/ana/irextbb.c
index 0e1a17ec5..71506c164 100644
--- a/ir/ana/irextbb.c
+++ b/ir/ana/irextbb.c
@@ -38,7 +38,7 @@
 /**
  * Environment for extbb construction.
  */
-typedef struct _env {
+typedef struct env {
 	struct obstack *obst;   /**< the obstack where allocations took place */
 	ir_extblk *head;        /**< head of the list of all extended blocks */
 	ir_node *start_block;   /**< the start block of the current graph */
@@ -93,7 +93,7 @@ static int get_block_n_succs(ir_node *block)
 static void pre_walk_calc_extbb(ir_node *block, void *ctx)
 {
 	int n = get_Block_n_cfgpreds(block);
-	env_t *env = ctx;
+	env_t *env = (env_t*) ctx;
 
 	if (n <= 0 || n > 1 || block == env->start_block) {
 		/*
@@ -149,7 +149,7 @@ static ir_extblk _sentinel = { k_ir_extblk, 0xFEA1DEAD, NULL, NULL };
 static void post_walk_calc_extbb(ir_node *block, void *ctx)
 {
 	ir_extblk *extbb = get_Block_extbb(block);
-	env_t *env = ctx;
+	env_t *env = (env_t*) ctx;
 	ir_extblk *sentinel = &_sentinel;
 
 	if (! extbb) {
@@ -189,7 +189,7 @@ static void post_walk_calc_extbb(ir_node *block, void *ctx)
 		}
 		/* arg, the list is in wrong order, turn around and add to the extbb list */
 		for (curr = list; curr; curr = prev) {
-			prev = get_irn_link(curr);
+			prev = (ir_node*) get_irn_link(curr);
 			set_irn_link(curr, extbb->link);
 			extbb->link = curr;
 			set_Block_extbb(curr, extbb);
@@ -240,8 +240,8 @@ void compute_extbb(ir_graph *irg)
 
 		extbb->blks = NEW_ARR_D(ir_node *, env.obst, len);
 
-		for (block = extbb->link, i = 0; i < len; ++i) {
-			ir_node *nblock = get_irn_link(block);
+		for (block = (ir_node*) extbb->link, i = 0; i < len; ++i) {
+			ir_node *nblock = (ir_node*) get_irn_link(block);
 
 			/* ensure that the leader is the first one */
 			extbb->blks[len - 1 - i] = block;
@@ -266,7 +266,7 @@ void compute_extbb(ir_graph *irg)
 		extbb->visited = 0;
 	}
 
-	irg->extblk_state = extblk_valid;
+	irg->extblk_state = ir_extblk_info_valid;
 }
 
 /* free all extended block info. */
@@ -277,7 +277,7 @@ void free_extbb(ir_graph *irg)
 		xfree(irg->extbb_obst);
 		irg->extbb_obst = NULL;
 	}
-	irg->extblk_state = extblk_none;
+	irg->extblk_state = ir_extblk_info_none;
 }
 
 /* Return the extended block of a node. */
@@ -380,7 +380,7 @@ static void irg_extblock_walk_2(ir_extblk *blk, extbb_walk_func *pre, extbb_walk
 	}
 }
 
-/* walks only over extended Block nodes in the graph.  Has it's own visited
+/* walks only over extended Block nodes in the graph.  Has its own visited
    flag, so that it can be interleaved with the other walker.         */
 void irg_extblock_walk(ir_extblk *blk, extbb_walk_func *pre, extbb_walk_func *post, void *env)
 {