X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Fircgcons.c;h=4d47d2fd293fe8afac75c04affd3fe0dddb09324;hb=e570f00fb465d212dde403160e97ab45d36d1d7e;hp=dd9af4a7729d9083bf97ab7fbfefad2ee2b9ecfe;hpb=bbba4631276380ff7e88dbc70a3b8fb89cb96899;p=libfirm

diff --git a/ir/ir/ircgcons.c b/ir/ir/ircgcons.c
index dd9af4a77..4d47d2fd2 100644
--- a/ir/ir/ircgcons.c
+++ b/ir/ir/ircgcons.c
@@ -10,7 +10,9 @@
  * Copyright:   (c) 2002-2003 Universität Karlsruhe
  * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
  */
-
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #include <string.h>
 #include <stdbool.h>
@@ -21,8 +23,10 @@
 #include "ircons.h"
 #include "irgmod.h"
 #include "irgwalk.h"
-#include "irflag.h"
+#include "irflag_t.h"
+
 
+// # define CATE_jni
 
 /* Datenstruktur für jede Methode */
 typedef struct {
@@ -59,8 +63,10 @@ static void caller_init(int arr_length, entity ** free_methods) {
 	entity * ent = get_Call_callee(call, j);
 	if (ent) {
 	  irg_data_t * data = get_entity_link(ent);
+# ifndef CATE_jni
 	  assert(get_entity_irg(ent) && data);
 	  ++data->count;
+# endif /* ndef CATE_jni */
 	}
       }
     }
@@ -156,7 +162,7 @@ static ir_node * exchange_proj(ir_node * proj) {
 /* Echt neue Block-Operation erzeugen. CSE abschalten! */
 static ir_node * create_Block(int n, ir_node ** in) {
   /* Turn off optimizations so that blocks are not merged again. */
-  int rem_opt = get_optimize();
+  int rem_opt = get_opt_optimize();
   ir_node * block;
   set_optimize(0);
   block = new_Block(n, in);