mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-10-13 10:07:38 -04:00
6b063acaae
* binutils (mips) uses its own 'static_assert' * linux (mips) uses constexpr when generating headers With these patches, all toolchains build successfully under GCC15 (These patches are still needed with the pending GCC9.5 bump) Change-Id: Id2f8cca414d2907b6aa29612ae4fb0e8b5f79f79
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
diff --git a/scripts/unifdef.c b/scripts/unifdef.c
|
|
index db00e3e30a59..1cc31448fd10 100644
|
|
--- a/scripts/unifdef.c
|
|
+++ b/scripts/unifdef.c
|
|
@@ -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 @@ eval_unary(const struct ops *ops, int *valp, const char **cpp)
|
|
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 @@ eval_unary(const struct ops *ops, int *valp, const char **cpp)
|
|
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 @@ ifeval(const char **cpp)
|
|
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);
|
|
}
|
|
|
|
/*
|