From 3f169aa4cf84cddd171f153150b2fb0ea1fa767a Mon Sep 17 00:00:00 2001
From: Matthias Braun <matze@braunis.de>
Date: Fri, 15 Dec 2006 12:33:20 +0000
Subject: [PATCH] quad_t is defined by glibc headers (because of _GNU_SOURCE),
 so rename to quadruple_t

[r8464]
---
 ir/opt/opt_osr.c      | 12 ++++++------
 ir/opt/proc_cloning.c | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ir/opt/opt_osr.c b/ir/opt/opt_osr.c
index c32e57364..26e864796 100644
--- a/ir/opt/opt_osr.c
+++ b/ir/opt/opt_osr.c
@@ -79,13 +79,13 @@ typedef struct iv_env {
 /**
  * An entry in the (op, node, node) -> node map.
  */
-typedef struct quad_t {
+typedef struct quadruple_t {
 	opcode  code;  /**< the opcode of the reduced operation */
 	ir_node *op1;  /**< the first operand the reduced operation */
 	ir_node *op2;  /**< the second operand of the reduced operation */
 
 	ir_node *res; /**< the reduced operation */
-} quad_t;
+} quadruple_t;
 
 /**
  * A LFTR edge.
@@ -185,8 +185,8 @@ static int is_rc(ir_node *irn, ir_node *header_block) {
  * Set compare function for the quad set.
  */
 static int quad_cmp(const void *e1, const void *e2, size_t size) {
-	const quad_t *c1 = e1;
-	const quad_t *c2 = e2;
+	const quadruple_t *c1 = e1;
+	const quadruple_t *c2 = e2;
 
 	return c1->code != c2->code || c1->op1 != c2->op1 || c1->op2 != c2->op2;
 }
@@ -202,7 +202,7 @@ static int quad_cmp(const void *e1, const void *e2, size_t size) {
  * @return the already reduced node or NULL if this operation is not yet reduced
  */
 static ir_node *search(opcode code, ir_node *op1, ir_node *op2, iv_env *env) {
-	quad_t key, *entry;
+	quadruple_t key, *entry;
 
 	key.code = code;
 	key.op1 = op1;
@@ -225,7 +225,7 @@ static ir_node *search(opcode code, ir_node *op1, ir_node *op2, iv_env *env) {
  * @param env     the environment
  */
 static void add(opcode code, ir_node *op1, ir_node *op2, ir_node *result, iv_env *env) {
-	quad_t key;
+	quadruple_t key;
 
 	key.code = code;
 	key.op1  = op1;
diff --git a/ir/opt/proc_cloning.c b/ir/opt/proc_cloning.c
index 21b35891e..50f91d162 100644
--- a/ir/opt/proc_cloning.c
+++ b/ir/opt/proc_cloning.c
@@ -63,13 +63,13 @@ typedef struct quadruple {
   int             pos;      /**< Position of a constant argument of our Call. */
   tarval          *tv;      /**< The tarval of this argument if Const node. */
   ir_node         **calls;  /**< The list of all calls with the same characteristics */
-} quad_t;
+} quadruple_t;
 
 /**
  * The quadruplets are hold in a sorted list
  */
 typedef struct entry {
-  quad_t       q;      /**< the quadruple */
+  quadruple_t       q;      /**< the quadruple */
   float        weight; /**< its weight */
   struct entry *next;  /**< link to the next one */
 } entry_t;
@@ -345,7 +345,7 @@ static ir_node *get_irg_arg(ir_graph *irg, int pos)
  * @param ent The entity of the method that must be cloned.
  * @param q   Our quadruplet.
  */
-static void create_clone_proc_irg(ir_entity *ent, quad_t *q)
+static void create_clone_proc_irg(ir_entity *ent, quadruple_t *q)
 {
   ir_graph *method_irg, *clone_irg;
   ir_node *arg, *const_arg;
@@ -384,7 +384,7 @@ static void create_clone_proc_irg(ir_entity *ent, quad_t *q)
  * @param ent The entity of the clone.
  * @param nr  A pointer to the counter of clones.
  **/
-static void change_entity_type(quad_t *q, ir_entity *ent, unsigned *nr)
+static void change_entity_type(quadruple_t *q, ir_entity *ent, unsigned *nr)
 {
   ir_type *mtp, *new_mtp, *tp;
   ident   *tp_name;
@@ -422,7 +422,7 @@ static void change_entity_type(quad_t *q, ir_entity *ent, unsigned *nr)
  *
  * @param q   Contains information for the method to clone.
  */
-static ir_entity *clone_method(quad_t *q)
+static ir_entity *clone_method(quadruple_t *q)
 {
   ir_entity *new_entity;
   ident *clone_ident;
@@ -504,7 +504,7 @@ static ir_node *new_cl_Call(ir_node *call, ir_entity *new_entity, int pos)
  * @param cloned_ent    The entity of the new function that must be called
  *                      from the new Call.
  */
-static void exchange_calls(quad_t *q, ir_entity *cloned_ent)
+static void exchange_calls(quadruple_t *q, ir_entity *cloned_ent)
 {
   int pos = q->pos;
   ir_node *new_call, *call;
-- 
2.20.1