X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fberaextern.c;h=9acc040603187502af06fab90bdf1c40d354bf7e;hb=6e3e499d6c68aee0c6a9ada6a99f16c4f6f8445b;hp=8a9d45ea91e93228c18151b3dd516bff5393b67e;hpb=48bb3d05a2605481bf32b4fb20dbb41c4898e24e;p=libfirm

diff --git a/ir/be/beraextern.c b/ir/be/beraextern.c
index 8a9d45ea9..9acc04060 100644
--- a/ir/be/beraextern.c
+++ b/ir/be/beraextern.c
@@ -58,10 +58,11 @@ alloc		::= node-nr reg-nr .
 #include "config.h"
 #endif
 
-#ifdef WIN32
-#include <malloc.h>
-#else
-#include <alloca.h>
+#ifdef HAVE_MALLOC_H
+ #include <malloc.h>
+#endif
+#ifdef HAVE_ALLOCA_H
+ #include <alloca.h>
 #endif
 
 #include <stdio.h>
@@ -497,7 +498,7 @@ static void extract_vars_of_cls(be_raext_env_t *raenv) {
 	int count = 0;
 	var_info_t *vi;
 
-	raenv->cls_vars = malloc(set_count(raenv->vars) * sizeof(*raenv->cls_vars));
+	raenv->cls_vars = xmalloc(set_count(raenv->vars) * sizeof(*raenv->cls_vars));
 	assert(raenv->cls_vars);
 
 	set_foreach(raenv->vars, vi)
@@ -938,7 +939,7 @@ static void be_ra_extern_main(const be_irg_t *bi) {
 	raenv.aenv     = env->arch_env;
 	raenv.dom_info = be_compute_dominance_frontiers(irg);
 	raenv.vars     = new_set(compare_var_infos, 64);
-	raenv.dbg      = firm_dbg_register("ir.be.raextern");
+	FIRM_DBG_REGISTER(raenv.dbg, "ir.be.raextern");
 	firm_dbg_set_mask(raenv.dbg, DBG_LEVEL);
 
 	/* Insert copies for constraints */