summaryrefslogtreecommitdiffstats
path: root/scripts/kconfig/expr.c
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2008-01-07 21:09:55 +0100
committerSam Ravnborg <sam@ravnborg.org>2008-01-28 23:14:38 +0100
commitd6ee35764f270c699e165b15dc59f4e55546bfda (patch)
tree021bd7249f0aeaa8280c83c938bd5755ecc9c65a /scripts/kconfig/expr.c
parentd84876f9f8042d5536050b83674c4f348ca3c4df (diff)
downloadblackbird-op-linux-d6ee35764f270c699e165b15dc59f4e55546bfda.tar.gz
blackbird-op-linux-d6ee35764f270c699e165b15dc59f4e55546bfda.zip
kconfig: rename E_OR & friends to avoid name clash
We had macros named the same as a set of enumeration values. It is legal code but very confusing to read - so rename the macros from E_* to EXPR_* Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Roman Zippel <zippel@linux-m68k.org>
Diffstat (limited to 'scripts/kconfig/expr.c')
-rw-r--r--scripts/kconfig/expr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c
index 6f98dbfe70cf..c8793d1d908f 100644
--- a/scripts/kconfig/expr.c
+++ b/scripts/kconfig/expr.c
@@ -955,14 +955,14 @@ tristate expr_calc_value(struct expr *e)
case E_AND:
val1 = expr_calc_value(e->left.expr);
val2 = expr_calc_value(e->right.expr);
- return E_AND(val1, val2);
+ return EXPR_AND(val1, val2);
case E_OR:
val1 = expr_calc_value(e->left.expr);
val2 = expr_calc_value(e->right.expr);
- return E_OR(val1, val2);
+ return EXPR_OR(val1, val2);
case E_NOT:
val1 = expr_calc_value(e->left.expr);
- return E_NOT(val1);
+ return EXPR_NOT(val1);
case E_EQUAL:
sym_calc_value(e->left.sym);
sym_calc_value(e->right.sym);
OpenPOWER on IntegriCloud