X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fldst2.c;h=4184e305b8250444dbaba07734534a9d035225cc;hb=fdbe9a6bb4824810b57bb946d03e39f981641fb7;hp=17029a28efcf26cb5d4cc79411fe453d98b1ea1f;hpb=e9acaaa06c895c2632071e8d42e8632253c3d9f8;p=libfirm

diff --git a/ir/opt/ldst2.c b/ir/opt/ldst2.c
index 17029a28e..4184e305b 100644
--- a/ir/opt/ldst2.c
+++ b/ir/opt/ldst2.c
@@ -23,13 +23,11 @@
  * @author  Christoph Mallon
  * @version $Id: $
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "iroptimize.h"
 
-#include "array.h"
+#include "array_t.h"
 #include "debug.h"
 #include "ircons.h"
 #include "irgraph.h"
@@ -525,7 +523,7 @@ static void Detotalise(ir_graph* irg)
 	size_t npreds = get_Block_n_cfgpreds(end_block);
 	size_t i;
 
-	unfinished_phis = xmalloc(sizeof(*unfinished_phis) * count_addrs);
+	unfinished_phis = XMALLOCN(ir_node, count_addrs);
 	for (i = 0; i < count_addrs; i++) {
 		unfinished_phis[i] = NULL;
 	}
@@ -788,7 +786,7 @@ static void walker(ir_node *proj, void *env)
 	}
 
 	n = ir_nodeset_size(&pi.user_mem);
-	if (n != 0) { /* nothing happend otherwise */
+	if (n != 0) { /* nothing happened otherwise */
 		ir_graph               *irg  = current_ir_graph;
 		ir_node                *sync;
 		ir_node               **in;