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>

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 {
         union expr_data left, right;
 };
 
-#define E_OR(dep1, dep2)        (((dep1)>(dep2))?(dep1):(dep2))
-#define E_AND(dep1, dep2)       (((dep1)<(dep2))?(dep1):(dep2))
-#define E_NOT(dep)              (2-(dep))
+#define EXPR_OR(dep1, dep2)     (((dep1)>(dep2))?(dep1):(dep2))
+#define EXPR_AND(dep1, dep2)    (((dep1)<(dep2))?(dep1):(dep2))
+#define EXPR_NOT(dep)           (2-(dep))
 
 struct expr_value {
         struct expr *expr;