Mario Fetka
44 lines
1.5 KiB
Diff
44 lines
1.5 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 2011-08-03 21:43:28.000000000 +0200
|
|
+++ linux-2.6.39.4/scripts/unifdef.c 2026-06-28 13:40:00.000000000 +0200
|
|
@@ -203,7 +203,7 @@
|
|
static int depth; /* current #if nesting */
|
|
static int delcount; /* count of deleted lines */
|
|
static unsigned blankcount; /* count of blank lines */
|
|
static unsigned blankmax; /* maximum recent blankcount */
|
|
-static bool constexpr; /* constant #if expression */
|
|
+static bool constexpression; /* constant #if expression */
|
|
static bool zerosyms = true; /* to format symdepth output */
|
|
static bool firstsym; /* ditto */
|
|
|
|
@@ -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 @@
|
|
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);
|
|
}
|
|
|
|
/*
|