From 0be55c9fb2192301f3d916412ed06b30c2fda46e Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Thu, 6 Aug 2009 17:27:46 +0000 Subject: linearize.h: sanitize header It's unfortunate to use 'true' and 'false' as identifiers in a system header. It clashes with corresponding macros from when included before . Signed-off-by: Kamil Dudka Acked-by: Hannes Eder Signed-off-by: Christopher Li --- linearize.c | 6 +++--- linearize.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/linearize.c b/linearize.c index 1a19214..238ee5d 100644 --- a/linearize.c +++ b/linearize.c @@ -666,7 +666,7 @@ void insert_branch(struct basic_block *bb, struct instruction *jmp, struct basic } -void insert_select(struct basic_block *bb, struct instruction *br, struct instruction *phi_node, pseudo_t true, pseudo_t false) +void insert_select(struct basic_block *bb, struct instruction *br, struct instruction *phi_node, pseudo_t if_true, pseudo_t if_false) { pseudo_t target; struct instruction *select; @@ -685,8 +685,8 @@ void insert_select(struct basic_block *bb, struct instruction *br, struct instru select->target = target; target->def = select; - use_pseudo(select, true, &select->src2); - use_pseudo(select, false, &select->src3); + use_pseudo(select, if_true, &select->src2); + use_pseudo(select, if_false, &select->src3); add_instruction(&bb->insns, select); add_instruction(&bb->insns, br); diff --git a/linearize.h b/linearize.h index 2205082..50b3601 100644 --- a/linearize.h +++ b/linearize.h @@ -328,7 +328,7 @@ struct entrypoint { struct instruction *entry; }; -extern void insert_select(struct basic_block *bb, struct instruction *br, struct instruction *phi, pseudo_t true, pseudo_t false); +extern void insert_select(struct basic_block *bb, struct instruction *br, struct instruction *phi, pseudo_t if_true, pseudo_t if_false); extern void insert_branch(struct basic_block *bb, struct instruction *br, struct basic_block *target); pseudo_t alloc_phi(struct basic_block *source, pseudo_t pseudo, int size); -- cgit v1.2.3-65-gdbad