Avoiding more warnings.

[r431]

diff --git a/ir/common/common.h b/ir/common/common.h
index 8f400de..5af6fce 100644 (file)
--- a/ir/common/common.h
+++ b/ir/common/common.h
@@ -12,6 +12,8 @@
 # ifndef _COMMON_H_
 # define _COMMON_H_
 
+#define INLINE inline
+
 /* a list of firm kinds */
 typedef enum {
   k_entity,

diff --git a/ir/common/firm.c b/ir/common/firm.c
index 786d35d..3f1cd91 100644 (file)
--- a/ir/common/firm.c
+++ b/ir/common/firm.c
@@ -16,9 +16,11 @@
 # include "firm.h"
 # include "mangle.h"
 # include "xp_help.h"
-# include "irnode_t.h"
 # include "tv_t.h"
+/* init functions are not public */
 # include "tpop_t.h"
+# include "irnode_t.h"
+# include "irmode_t.h"
 
 void
 init_firm (void)
@@ -44,8 +46,8 @@ init_firm (void)
   init_mangle ();
   /* initalize all op codes an irnode can consist of */
   init_op ();
-  /* called once for each run of this library, empty at this moment!!! */
-  init_cons ();
+  /* called once for each run of this library, empty right now... @@@!!!
+     init_cons (); */
   /* Builds a construct allowing to access all information to be constructed
      later. */
   init_irprog ();

diff --git a/ir/ir/irgmod.c b/ir/ir/irgmod.c
index b9b8419..7aeb5ed 100644 (file)
--- a/ir/ir/irgmod.c
+++ b/ir/ir/irgmod.c
@@ -45,14 +45,14 @@ turn_into_tuple (ir_node *node, int arity)
    Since `new' may be bigger than `old' replace `old'
    by an op_Id which is smaller than everything */
 inline void
-exchange (ir_node *old, ir_node *new)
+exchange (ir_node *old, ir_node *nw)
 {
   ir_node *block = old->in[0];
 
   old->op = op_Id;
   old->in = NEW_ARR_D (ir_node *, current_ir_graph->obst, 2);
   old->in[0] = block;
-  old->in[1] = new;
+  old->in[1] = nw;
 }
 
 /**********************************************************************/

diff --git a/ir/ir/irgmod.h b/ir/ir/irgmod.h
index edacfca..3f4d202 100644 (file)
--- a/ir/ir/irgmod.h
+++ b/ir/ir/irgmod.h
@@ -16,7 +16,7 @@
 /* Exchanges two nodes by conserving edges leaving old (i.e., pointers
    pointing to old).  Turns the old node into an Id. Requires that
    current_ir_graph is set properly. */
-inline void exchange (ir_node *old, ir_node *new);
+inline void exchange (ir_node *old, ir_node *nw);
 
 /* Turns a node into a "useless" Tuple.  The Tuple node just forms a tuple
    from several inputs.  The predecessors of the tuple have to be

diff --git a/ir/ir/irnode_t.h b/ir/ir/irnode_t.h
index 53e0790..44056e1 100644 (file)
--- a/ir/ir/irnode_t.h
+++ b/ir/ir/irnode_t.h
@@ -32,8 +32,8 @@ typedef struct {
                                 @@@ Eventually overlay with graph_arr as only valid
                                 in different phases.  Eventually inline the whole
                                 datastructure. */
-  exc_t exc;                                   /* role of this block for exception handling */
-  ir_node *handler_entry;              /* handler entry block iff this block is part of a region */
+  exc_t exc;                 /* role of this block for exception handling */
+  ir_node *handler_entry;     /* handler entry block iff this block is part of a region */
   ir_node ** in_cg;           /* array with predecessors in
                               * interprocedural_view, if they differ
                               * from intraprocedural predecessors */

diff --git a/ir/tr/tpop_t.h b/ir/tr/tpop_t.h
index 2f8917c..be3cc7a 100644 (file)
--- a/ir/tr/tpop_t.h
+++ b/ir/tr/tpop_t.h
@@ -1,8 +1,8 @@
 
 /* $Id$ */
 
-# ifndef _IROP_T_H_
-# define _IROP_T_H_
+# ifndef _TPOP_T_H_
+# define _TPOP_T_H_
 
 # include <stddef.h>
 # include "tpop.h"
@@ -85,4 +85,4 @@ void init_tpop (void);
  */
 int get_tpop_attr_size (tp_op *op);
 
-#endif /* _IROP_T_H_ */
+#endif /* _TPOP_T_H_ */