make #ifndef at header start cannonical

[r7772]

diff --git a/ir/ir/irarch.h b/ir/ir/irarch.h
index 84e8b88..8a16de6 100644 (file)
--- a/ir/ir/irarch.h
+++ b/ir/ir/irarch.h
@@ -7,10 +7,10 @@
  * $Id$
  */
 
-#ifndef _FIRM_IRARCH_H
-#define _FIRM_IRARCH_H
+#ifndef _FIRM_IR_IRARCH_H_
+#define _FIRM_IR_IRARCH_H_
 
-#include "irnode.h"
+#include "firm_types.h"
 
 /**
  * A parameter structure that drives the machine dependent Firm
@@ -136,4 +136,4 @@ ir_node *arch_dep_replace_mod_by_const(ir_node *irn);
  */
 void arch_dep_replace_divmod_by_const(ir_node **div, ir_node **mod, ir_node *irn);
 
-#endif /* _FIRM_IRARCH_H */
+#endif /* _FIRM_IR_IRARCH_H_ */

diff --git a/ir/ir/ircgcons.h b/ir/ir/ircgcons.h
index 84c195f..2aa37d3 100644 (file)
--- a/ir/ir/ircgcons.h
+++ b/ir/ir/ircgcons.h
@@ -10,13 +10,10 @@
  * Copyright:   (c) 2002-2003 Universität Karlsruhe
  * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
  */
+#ifndef _FIRM_IR_ICGCONS_H_
+#define _FIRM_IR_ICGCONS_H_
 
-
-#ifndef _CONSTRUCT_H_
-#define _CONSTRUCT_H_
-
-
-#include "entity.h"
+#include "firm_types.h"
 
 /** The state of the interprocedural view.
  *
@@ -52,5 +49,4 @@ void cg_construct(int arr_len, entity *free_methods_arr[]);
     the ir. Sets ip_view_no in irp. */
 void cg_destruct(void);
 
-
-#endif /* _CONSTRUCT_H_ */
+#endif /* _FIRM_IR_ICGCONS_H_ */

diff --git a/ir/ir/ircgopt.h b/ir/ir/ircgopt.h
index 65f72c7..e170bf0 100644 (file)
--- a/ir/ir/ircgopt.h
+++ b/ir/ir/ircgopt.h
@@ -11,18 +11,16 @@
  */
 
 /**
+ * @file irgopt.h
+ *
  * Entfernen von nicht erreichbaren (aufrufbaren) Methoden. Die Menge
  * der nicht erreichbaren Methoden wird aus der Abschätzung der
  * Aufrufrelation bestimmt.
  */
+#ifndef _FIRM_IR_ICGOPT_H_
+#define _FIRM_IR_ICGOPT_H_
 
-
-#ifndef _GC_IRGS_H_
-#define _GC_IRGS_H_
-
-
-#include "entity.h"
-
+#include "firm_types.h"
 
 /* Entfernt alle Methoden, die von den Methoden aus "keep_arr"
  * (bezgl. der Abschaetzung get_Call_callee) nicht erreichbar sind. Die
@@ -33,5 +31,4 @@
  * Frees all interprocedural loop information. */
 void gc_irgs(int n_keep, entity *keep_arr[]);
 
-
-#endif /* _GC_IRGS_H_ */
+#endif /* _FIRM_IR_ICGOPT_H_ */

diff --git a/ir/ir/ircons.h b/ir/ir/ircons.h
index d761a62..1d8ff46 100644 (file)
--- a/ir/ir/ircons.h
+++ b/ir/ir/ircons.h
@@ -1087,8 +1087,8 @@
  *   node.
  *
  */
-#ifndef _IRCONS_H_
-#define _IRCONS_H_
+#ifndef _FIRM_IR_IRCONS_H_
+#define _FIRM_IR_IRCONS_H_
 
 #include "firm_common.h"
 #include "irnode.h"
@@ -4205,4 +4205,4 @@ void irp_finalize_cons(void);
  */
 typedef ir_node *uninitialized_local_variable_func_t(ir_graph *irg, ir_mode *mode, int pos);
 
-#endif /* _IRCONS_H_ */
+#endif /* _FIRM_IR_IRCONS_H_ */

diff --git a/ir/ir/irdump.h b/ir/ir/irdump.h
index 206f3a8..40a767f 100644 (file)
--- a/ir/ir/irdump.h
+++ b/ir/ir/irdump.h
@@ -10,7 +10,6 @@
  * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
  */
 
-
 /**
  * @file irdump.h
  *
@@ -28,14 +27,12 @@
  * Most routines use the name of the passed entity as the name of the
  * file dumped to.
  */
+#ifndef _FIRM_IR_IRDUMP_H_
+#define _FIRM_IR_IRDUMP_H_
 
-
-# ifndef _IRDUMP_H_
-# define _IRDUMP_H_
-
-# include "irnode.h"
-# include "irgraph.h"
-# include "irloop.h"
+#include "irnode.h"
+#include "irgraph.h"
+#include "irloop.h"
 
 /**
  * Names of the 32 supported colors
@@ -687,4 +684,4 @@ void *dump_add_node_info_callback(dump_node_info_cb_t *cb, void *data);
  */
 void dump_remv_node_info_callback(void *handle);
 
-# endif /* _IRDUMP_H_ */
+#endif /* _FIRM_IR_IRDUMP_H_ */

diff --git a/ir/ir/iredges.h b/ir/ir/iredges.h
index 2d8a734..57b52e5 100644 (file)
--- a/ir/ir/iredges.h
+++ b/ir/ir/iredges.h
@@ -15,8 +15,8 @@
  * @date 3.2.2005
  */
 
-#ifndef _FIRM_EDGES_H
-#define _FIRM_EDGES_H
+#ifndef _FIRM_IR_EDGES_H
+#define _FIRM_IR_EDGES_H
 
 #include "firm_types.h"
 
@@ -134,4 +134,4 @@ extern void edges_activate(ir_graph *irg);
  */
 extern void edges_deactivate(ir_graph *irg);
 
-#endif /* _FIRM_EDGES_H */
+#endif /* _FIRM_IR_EDGES_H */

diff --git a/ir/ir/irflag.h b/ir/ir/irflag.h
index 7041e18..c1a0ad6 100644 (file)
--- a/ir/ir/irflag.h
+++ b/ir/ir/irflag.h
@@ -31,8 +31,8 @@
  * 4. Verification flag
  *    This one controls the behavior of node and type verifications
  */
-#ifndef _IRFLAG_H_
-#define _IRFLAG_H_
+#ifndef _FIRM_IR_IRFLAG_H_
+#define _FIRM_IR_IRFLAG_H_
 
 #include "firm_types.h"
 
@@ -358,4 +358,4 @@ typedef enum _firm_verification_t {
  */
 void do_node_verification(firm_verification_t mode);
 
-#endif /* _IRFLAG_H_ */
+#endif /* _FIRM_IR_IRFLAG_H_ */

diff --git a/ir/ir/irgmod.h b/ir/ir/irgmod.h
index 55cdd53..f3f77fe 100644 (file)
--- a/ir/ir/irgmod.h
+++ b/ir/ir/irgmod.h
@@ -18,12 +18,10 @@
  *
  * @author Martin Trapp, Christian Schaefer
  */
+#ifndef _FIRM_IR_IRGMOD_H_
+#define _FIRM_IR_IRGMOD_H_
 
-
-# ifndef _IRGMOD_H_
-# define _IRGMOD_H_
-
-# include "irnode.h"
+#include "firm_types.h"
 
 /** Exchanges two nodes by conserving edges leaving old (i.e.,
    pointers pointing to old).  Turns the old node into an Id. */
@@ -70,4 +68,4 @@ void collect_phiprojs(ir_graph *irg);
  */
 void part_block(ir_node *node);
 
-#endif /* ifndef _IRGMOD_H_ */
+#endif /* ifndef _FIRM_IR_IRGMOD_H_ */

diff --git a/ir/ir/irgopt.h b/ir/ir/irgopt.h
index 786dff6..65e0524 100644 (file)
--- a/ir/ir/irgopt.h
+++ b/ir/ir/irgopt.h
@@ -17,11 +17,10 @@
  *
  * @author Christian Schaefer, Goetz Lindenmaier
  */
+#ifndef _FIRM_IR_IRGOPT_H_
+#define _FIRM_IR_IRGOPT_H_
 
-# ifndef _IRGOPT_H_
-# define _IRGOPT_H_
-
-# include "irgraph.h"
+#include "firm_types.h"
 
 /** Applies local optimizations (see iropt.h) to all nodes reachable from node n.
  *
@@ -206,4 +205,4 @@ void place_code(ir_graph *irg);
  */
 void remove_critical_cf_edges(ir_graph *irg);
 
-# endif /* _IRGOPT_H_ */
+#endif /* _FIRM_IR_IRGOPT_H_ */

diff --git a/ir/ir/irgraph.h b/ir/ir/irgraph.h
index 1bbe4bb..1500e8f 100644 (file)
--- a/ir/ir/irgraph.h
+++ b/ir/ir/irgraph.h
@@ -17,8 +17,8 @@
  *
  * @author Martin Trapp, Christian Schaefer
  */
-#ifndef _IRGRAPH_H_
-#define _IRGRAPH_H_
+#ifndef _FIRM_IR_IRGRAPH_H_
+#define _FIRM_IR_IRGRAPH_H_
 
 #include <stddef.h>
 
@@ -508,4 +508,4 @@ unsigned get_irg_last_idx(const ir_graph *irg);
  */
 size_t register_additional_graph_data(size_t size);
 
-# endif /* _IRGRAPH_H_ */
+#endif /* _FIRM_IR_IRGRAPH_H_ */

diff --git a/ir/ir/irgwalk.h b/ir/ir/irgwalk.h
index 7f25749..5173e4b 100644 (file)
--- a/ir/ir/irgwalk.h
+++ b/ir/ir/irgwalk.h
@@ -25,12 +25,10 @@
  * Uses current_ir_graph (from irgraph.h)!!! Set it to the proper
  * graph before starting the walker.
  */
+#ifndef _FIRM_IR_IRGWALK_H_
+#define _FIRM_IR_IRGWALK_H_
 
-
-# ifndef _IRGWALK_H_
-# define _IRGWALK_H_
-
-# include "firm_types.h"
+#include "firm_types.h"
 
 /* type of callback function for ir_graph walk */
 #ifndef _IRG_WALK_FUNC_TYPEDEF_
@@ -175,4 +173,4 @@ void irg_walk_blkwise_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *po
  */
 void irg_walk_anchors(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env);
 
-# endif /* _IRGWALK_H_ */
+#endif /* _FIRM_IR_IRGWALK_H_ */

diff --git a/ir/ir/irhooks.h b/ir/ir/irhooks.h
index c32f522..7400e3b 100644 (file)
--- a/ir/ir/irhooks.h
+++ b/ir/ir/irhooks.h
@@ -16,8 +16,8 @@
  *
  * @author Michael Beck
  */
-#ifndef __IRHOOKS_H__
-#define __IRHOOKS_H__
+#ifndef _FIRM_IR_IRHOOKS_H_
+#define _FIRM_IR_IRHOOKS_H_
 
 #include "firm_config.h"
 #include "irop.h"
@@ -284,4 +284,4 @@ extern hook_entry_t *hooks[hook_last];
 /* the initializer, move to hooks_t.h some day */
 int firm_init_hooks(void);
 
-#endif /* __IRHOOKS_H__ */
+#endif /* _FIRM_IR_IRHOOKS_H_ */

diff --git a/ir/ir/irmode.h b/ir/ir/irmode.h
index f6e3e6e..a238729 100644 (file)
--- a/ir/ir/irmode.h
+++ b/ir/ir/irmode.h
@@ -26,8 +26,8 @@
  *
  */
 
-#ifndef _IRMODE_H_
-#define _IRMODE_H_
+#ifndef _FIRM_IR_IRMODE_H_
+#define _FIRM_IR_IRMODE_H_
 
 #include "firm_types.h"
 #include "ident.h"
@@ -471,4 +471,4 @@ int mode_overflow_on_unary_Minus(const ir_mode *mode);
  */
 int mode_wrap_around(const ir_mode *mode);
 
-#endif /* _IRMODE_H_ */
+#endif /* _FIRM_IR_IRMODE_H_ */

diff --git a/ir/ir/irnode.h b/ir/ir/irnode.h
index e999179..6680699 100644 (file)
--- a/ir/ir/irnode.h
+++ b/ir/ir/irnode.h
@@ -9,8 +9,8 @@
  * Copyright:   (c) 1998-2003 Universität Karlsruhe
  * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
  */
-#ifndef _IRNODE_H_
-#define _IRNODE_H_
+#ifndef _FIRM_IR_IRNODE_H_
+#define _FIRM_IR_IRNODE_H_
 
 #include <stddef.h>
 
@@ -1245,4 +1245,4 @@ int dump_node_opcode(FILE *F, ir_node *n);
 }
 #endif
 
-#endif /* _IRNODE_H_ */
+#endif /* _FIRM_IR_IRNODE_H_ */

diff --git a/ir/ir/irop.h b/ir/ir/irop.h
index 02acba4..47aae4e 100644 (file)
--- a/ir/ir/irop.h
+++ b/ir/ir/irop.h
@@ -21,8 +21,8 @@
  *  definition is close to the operations specified in UKA Tech-Report
  *  1999-14
  */
-#ifndef _IROP_H_
-#define _IROP_H_
+#ifndef _FIRM_IR_IROP_H_
+#define _FIRM_IR_IROP_H_
 
 #include "firm_types.h"
 
@@ -37,10 +37,10 @@ typedef enum {
   oparity_trinary,            /**< an trinary operator  -- considering 'numeric' arguments.*/
   oparity_zero,               /**< no operators, as e.g. Const. */
   oparity_variable,           /**< arity not fixed by opcode, but statically
-                                                          known.  E.g., number of arguments to call. */
+                                   known.  E.g., number of arguments to call. */
   oparity_dynamic,            /**< arity depends on state of firm representation.
-                                                    Can change by optimizations...
-                                                    We must allocate a dynamic in array for the node! */
+                                   Can change by optimizations...
+                                   We must allocate a dynamic in array for the node! */
   oparity_any                 /**< other arity */
 } op_arity;
 
@@ -48,11 +48,11 @@ typedef enum {
 /** The irop flags */
 typedef enum {
   irop_flag_none        = 0x00000000, /**< nothing */
-  irop_flag_labeled     = 0x00000001,  /**< if set, Output edge labels on in-edges in vcg graph */
-  irop_flag_commutative = 0x00000002,  /**< operation is commutative */
+  irop_flag_labeled     = 0x00000001, /**< if set, Output edge labels on in-edges in vcg graph */
+  irop_flag_commutative = 0x00000002, /**< operation is commutative */
   irop_flag_cfopcode    = 0x00000004, /**< is a control flow operation */
-  irop_flag_ip_cfopcode = 0x00000008,  /**< operation manipulates interprocedural control flow */
-  irop_flag_fragile     = 0x00000010,  /**< set if the operation can change the control flow because
+  irop_flag_ip_cfopcode = 0x00000008, /**< operation manipulates interprocedural control flow */
+  irop_flag_fragile     = 0x00000010, /**< set if the operation can change the control flow because
                                              of an exception */
   irop_flag_forking     = 0x00000020, /**< the operation is a forking control flow */
   irop_flag_highlevel   = 0x00000040, /**< the operation is a pure high-level one and can be
@@ -357,4 +357,4 @@ ir_op * new_ir_op(opcode code, const char *name, op_pin_state p,
 /** Returns the ir_op_ops of an ir_op. */
 const ir_op_ops *get_op_ops(const ir_op *op);
 
-#endif /* _IROP_H_ */
+#endif /* _FIRM_IR_IROP_H_ */

diff --git a/ir/ir/iropt.h b/ir/ir/iropt.h
index 2bfc58a..98a1d72 100644 (file)
--- a/ir/ir/iropt.h
+++ b/ir/ir/iropt.h
@@ -3,7 +3,7 @@
  * File name:   ir/ir/iropt.h
  * Purpose:     iropt --- optimizations of an ir node.
  * Author:      Martin Trapp, Christian Schaefer
- * Modified by: Goetz Lindenmaier
+ * Modified by: Goetz Lindenmaier, Michael Beck
  * Created:
  * CVS-ID:      $Id$
  * Copyright:   (c) 1998-2003 Universität Karlsruhe
@@ -11,25 +11,21 @@
  */
 
 /**
-* @file iropt.h
-*
-* Declarations for optimizations of an ir node.
-*
-* @author Martin Trapp, Christian Schaefer
-*/
-
-
-# ifndef _IROPT_H_
-# define _IROPT_H_
+ * @file iropt.h
+ *
+ * Declarations for optimizations of an ir node.
+ *
+ * @author Martin Trapp, Christian Schaefer
+ */
+#ifndef _FIRM_IR_IROPT_H_
+#define _FIRM_IR_IROPT_H_
 
-# include "irnode.h"
-# include "irgraph.h"
-# include "irflag.h"
+#include "firm_types.h"
 
 /** If the expression referenced can be evaluated statically
  *  computed_value returns a tarval representing the result.
  *  Else returns tarval_bad. */
-tarval *computed_value (ir_node *n);
+tarval *computed_value(ir_node *n);
 
 /** Applies all optimizations to n that are expressible as a pattern
  *  in Firm, i.e., they need not a walk of the graph.
@@ -39,6 +35,6 @@ tarval *computed_value (ir_node *n);
  *  An equivalent optimization is applied in the constructors defined in
  *  ircons.ch.  There n is freed if a better node could be found.
  */
-ir_node *optimize_in_place (ir_node *n);
+ir_node *optimize_in_place(ir_node *n);
 
-# endif /* _IROPT_H_ */
+#endif /* _FIRM_IR_IROPT_H_ */

diff --git a/ir/ir/irprintf.h b/ir/ir/irprintf.h
index 22934dd..1b40e25 100644 (file)
--- a/ir/ir/irprintf.h
+++ b/ir/ir/irprintf.h
@@ -16,9 +16,8 @@
  * @author Sebastian Hack
  * @date 29.11.2004
  */
-
-#ifndef _IRPRINTF_H
-#define _IRPRINTF_H
+#ifndef _FIRM_IR_IRPRINTF_H_
+#define _FIRM_IR_IRPRINTF_H_
 
 #include "firm_config.h"
 
@@ -147,4 +146,4 @@ void ir_obst_vprintf(struct obstack *obst, const char *fmt, va_list args);
 #include <libcore/lc_printf.h>
 #endif /* WITH_LIBCORE */
 
-#endif /* _IRPRINTF_H */
+#endif /* _FIRM_IR_IRPRINTF_H_ */

diff --git a/ir/ir/irprog.h b/ir/ir/irprog.h
index 3bb8113..68a9557 100644 (file)
--- a/ir/ir/irprog.h
+++ b/ir/ir/irprog.h
@@ -11,33 +11,33 @@
  */
 
 /**
-* @file irprog.h
-*
-* ir representation of a program.
-*
-* @author Goetz Lindenmaier
-*
-* This file defines a construct that keeps all information about a
-* program:
-*   - A reference point to the method to be executed on program start.
-*   - A list of all procedures.
-*   - A list of all types.
-*   - A global type that contais all global variables and procedures that do
-*     not belong to a class.  This type represents the data segment of the
-*     program.  It is not the base class of
-*     all classes in a class hierarchy (as, e.g., "object" in java).
-*   - A degenerated graph that contains constant expressions.
-*   - interprocedural outs state.
-*   - a flag indicating validity of the interprocedural representation.
-*   - the output file name
-*/
-
-# ifndef _IRPROG_H_
-# define _IRPROG_H_
-
-# include "irnode.h"
-# include "type.h"
-# include "irgraph.h"
+ * @file irprog.h
+ *
+ * ir representation of a program.
+ *
+ * @author Goetz Lindenmaier
+ *
+ * This file defines a construct that keeps all information about a
+ * program:
+ *   - A reference point to the method to be executed on program start.
+ *   - A list of all procedures.
+ *   - A list of all types.
+ *   - A global type that contais all global variables and procedures that do
+ *     not belong to a class.  This type represents the data segment of the
+ *     program.  It is not the base class of
+ *     all classes in a class hierarchy (as, e.g., "object" in java).
+ *   - A degenerated graph that contains constant expressions.
+ *   - interprocedural outs state.
+ *   - a flag indicating validity of the interprocedural representation.
+ *   - the output file name
+ */
+
+#ifndef _FIRM_IR_IRPROG_H_
+#define _FIRM_IR_IRPROG_H_
+
+#include "irnode.h"
+#include "type.h"
+#include "irgraph.h"
 
 
 /**
@@ -206,4 +206,4 @@ void           set_irp_ip_outs_inconsistent(void);
 irg_callee_info_state get_irp_callee_info_state(void);
 void                  set_irp_callee_info_state(irg_callee_info_state s);
 
-#endif /* ifndef _IRPROG_H_ */
+#endif /* ifndef _FIRM_IR_IRPROG_H_ */

diff --git a/ir/ir/irprog_t.h b/ir/ir/irprog_t.h
index bb94c0e..b3e3f91 100644 (file)
--- a/ir/ir/irprog_t.h
+++ b/ir/ir/irprog_t.h
@@ -14,8 +14,8 @@
  * @file irprog_t.h
  */
 
-#ifndef _IRPROG_T_H_
-#define _IRPROG_T_H_
+#ifndef _FIRM_IR_IRPROG_T_H_
+#define _FIRM_IR_IRPROG_T_H_
 
 #ifdef HAVE_CONFIG_H
 #include "firm_config.h"
@@ -182,4 +182,4 @@ void init_irprog_2(void);
 #define get_const_code_irg()   _get_const_code_irg()
 #define get_glob_type()        _get_glob_type()
 
-#endif /* ifndef _IRPROG_T_H_ */
+#endif /* ifndef _FIRM_IR_IRPROG_T_H_ */

diff --git a/ir/ir/irreflect.h b/ir/ir/irreflect.h
index cb83f25..c0db562 100644 (file)
--- a/ir/ir/irreflect.h
+++ b/ir/ir/irreflect.h
@@ -6,14 +6,13 @@
  *
  * $Id$
  */
-
-#ifndef _FIRM_REFLECT_H
-#define _FIRM_REFLECT_H
+#ifndef _FIRM_IR_REFLECT_H_
+#define _FIRM_IR_REFLECT_H_
 
 #include <limits.h>
 
+#include "firm_types.h"
 #include "irop.h"
-#include "irnode.h"
 
 #define RFLCT_MC(m) rflct_ms_ ## m
 typedef enum {
@@ -218,4 +217,4 @@ int rflct_signature_set_arg(rflct_sig_t *sig, int is_use, int num,
 int rflct_signature_get_index(const rflct_sig_t *sig, int is_use, int num);
 
 
-#endif /* _FIRM_REFLECT_H */
+#endif /* _FIRM_IR_REFLECT_H_ */

diff --git a/ir/ir/irvrfy.h b/ir/ir/irvrfy.h
index 1999955..4aa2142 100644 (file)
--- a/ir/ir/irvrfy.h
+++ b/ir/ir/irvrfy.h
@@ -17,8 +17,8 @@
  *
  * @author Christian Schaefer
  */
-#ifndef _IRVRFY_H_
-#define _IRVRFY_H_
+#ifndef _FIRM_IR_IRVRFY_H_
+#define _FIRM_IR_IRVRFY_H_
 
 #include "firm_types.h"
 
@@ -26,7 +26,7 @@
  * Tests the modes of checknode and its predecessors.
  * checknode must be in current_ir_graph.
  *
- * \return
+ * @return
  *     NON-zero on success
  */
 int irn_vrfy(ir_node *checknode);
@@ -35,7 +35,7 @@ int irn_vrfy(ir_node *checknode);
  * Tests the modes of checknode and its predecessors.
  * checknode must be in given ir_graph.
  *
- * \return
+ * @return
  *     NON-zero on success
  */
 int irn_vrfy_irg(ir_node *checknode, ir_graph *irg);
@@ -43,7 +43,7 @@ int irn_vrfy_irg(ir_node *checknode, ir_graph *irg);
 /**
  * Same as irn_vrfy_irg, but temporary sets verification mode to
  * NODE_VERIFICATION_ERROR_ONLY.
- * \return
+ * @return
  *     NON-zero on success
  */
 int irn_vrfy_irg_dump(ir_node *checknode, ir_graph *irg, const char **bad_string);
@@ -60,7 +60,7 @@ typedef enum _irg_verify_flags_t {
  * Calls irn_vrfy() for each node in irg.
  * Graph must be in state "op_pin_state_pinned".
  *
- * \return
+ * @return
  *     NON-zero on success.
  */
 int irg_verify(ir_graph *irg, unsigned flags);
@@ -97,4 +97,4 @@ int irg_vrfy_bads(ir_graph *irg, int flags);
  */
 void vrfy_enable_entity_tests(int enable);
 
-# endif /* _IRVRFY_H_ */
+#endif /* _FIRM_IR_IRVRFY_H_ */

diff --git a/ir/ir/pseudo_irg.h b/ir/ir/pseudo_irg.h
index 1a3d0d8..5c6a3fe 100644 (file)
--- a/ir/ir/pseudo_irg.h
+++ b/ir/ir/pseudo_irg.h
@@ -12,12 +12,10 @@
  * Licence:     This file is protected by GPL -  GNU GENERAL PUBLIC LICENSE.
  */
 
-#ifndef __PSEUDO_IRG_H__
-#define __PSEUDO_IRG_H__
-
-#include "entity.h"
-#include "irgraph.h"
+#ifndef _FIRM_IR_PSEUDO_IRG_H_
+#define _FIRM_IR_PSEUDO_IRG_H_
 
+#include "firm_types.h"
 
 /** Create a new ir graph to build a pseudo representation of a procedure.
  *
@@ -43,4 +41,4 @@ ir_graph *get_irp_pseudo_irg(int pos);
 void set_visit_pseudo_irgs(int x);
 int  get_visit_pseudo_irgs(void);
 
-#endif
+#endif /* _FIRM_IR_PSEUDO_IRG_H_ */

diff --git a/ir/tr/type_t.h b/ir/tr/type_t.h
index 2b6f3df..6a55be9 100644 (file)
--- a/ir/tr/type_t.h
+++ b/ir/tr/type_t.h
@@ -10,8 +10,8 @@
  * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
  */
 
-#ifndef _TYPE_T_H_
-#define _TYPE_T_H_
+#ifndef _FIRM_TR_TYPE_T_H_
+#define _FIRM_TR_TYPE_T_H_
 
 #include "firm_config.h"
 #include "type.h"
@@ -494,4 +494,4 @@ _set_method_calling_convention(ir_type *method, unsigned cc_mask) {
 #define get_method_calling_convention(method)           _get_method_calling_convention(method)
 #define set_method_calling_convention(method, cc_mask)  _set_method_calling_convention(method, cc_mask)
 
-#endif /* _TYPE_T_H_ */
+#endif /* _FIRM_TR_TYPE_T_H_ */