44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
diff -Naur linux-2.6.39.4.orig/scripts/unifdef.c linux-2.6.39.4/scripts/unifdef.c
|
|
--- linux-2.6.39.4.orig/scripts/unifdef.c 2026-06-28 13:13:50.140601973 +0200
|
|
+++ linux-2.6.39.4/scripts/unifdef.c 2026-06-28 13:13:50.143921033 +0200
|
|
@@ -819,7 +819,7 @@
|
|
/*
|
|
* Function for evaluating the innermost parts of expressions,
|
|
* viz. !expr (expr) number defined(symbol) symbol
|
|
- * We reset the constexpr flag in the last two cases.
|
|
+ * We reset the constexpression flag in the last two cases.
|
|
*/
|
|
static Linetype
|
|
eval_unary(const struct ops *ops, int *valp, const char **cpp)
|
|
@@ -877,7 +877,7 @@
|
|
cp = skipcomment(cp);
|
|
if (defparen && *cp++ != ')')
|
|
return (LT_ERROR);
|
|
- constexpr = false;
|
|
+ constexpression = false;
|
|
} else if (!endsym(*cp)) {
|
|
debug("eval%d symbol", ops - eval_ops);
|
|
sym = findsym(cp);
|
|
@@ -895,7 +895,7 @@
|
|
lt = *valp ? LT_TRUE : LT_FALSE;
|
|
cp = skipargs(cp);
|
|
}
|
|
- constexpr = false;
|
|
+ constexpression = false;
|
|
} else {
|
|
debug("eval%d bad expr", ops - eval_ops);
|
|
return (LT_ERROR);
|
|
@@ -955,10 +955,10 @@
|
|
int val = 0;
|
|
|
|
debug("eval %s", *cpp);
|
|
- constexpr = killconsts ? false : true;
|
|
+ constexpression = killconsts ? false : true;
|
|
ret = eval_table(eval_ops, &val, cpp);
|
|
debug("eval = %d", val);
|
|
- return (constexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret);
|
|
+ return (constexpression ? LT_IF : ret == LT_ERROR ? LT_IF : ret);
|
|
}
|
|
|
|
/*
|