aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/kconfig/expr.h
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2008-01-07 15:09:55 -0500
committerSam Ravnborg <sam@ravnborg.org>2008-01-28 17:14:38 -0500
commitd6ee35764f270c699e165b15dc59f4e55546bfda (patch)
tree021bd7249f0aeaa8280c83c938bd5755ecc9c65a /scripts/kconfig/expr.h
parentd84876f9f8042d5536050b83674c4f348ca3c4df (diff)
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.h')
-rw-r--r--scripts/kconfig/expr.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index a195986eec6f..b7889971e42d 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -45,9 +45,9 @@ struct expr {
45 union expr_data left, right; 45 union expr_data left, right;
46}; 46};
47 47
48#define E_OR(dep1, dep2) (((dep1)>(dep2))?(dep1):(dep2)) 48#define EXPR_OR(dep1, dep2) (((dep1)>(dep2))?(dep1):(dep2))
49#define E_AND(dep1, dep2) (((dep1)<(dep2))?(dep1):(dep2)) 49#define EXPR_AND(dep1, dep2) (((dep1)<(dep2))?(dep1):(dep2))
50#define E_NOT(dep) (2-(dep)) 50#define EXPR_NOT(dep) (2-(dep))
51 51
52struct expr_value { 52struct expr_value {
53 struct expr *expr; 53 struct expr *expr;