From 3ed6efc4ac9934f0a4c2fbc24af100824cebd4fd Mon Sep 17 00:00:00 2001 From: Ian Lepore Date: Sat, 26 Jul 2014 04:09:43 +0000 Subject: The 'flags' variable is conflicting with some inline code in a header file ("variable flags shadows a global..."), just rename this variable to wish away the problem. --- sys/boot/arm/at91/boot2/boot2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/boot') diff --git a/sys/boot/arm/at91/boot2/boot2.c b/sys/boot/arm/at91/boot2/boot2.c index 772ccbe76483..1e17ab21c14f 100644 --- a/sys/boot/arm/at91/boot2/boot2.c +++ b/sys/boot/arm/at91/boot2/boot2.c @@ -77,7 +77,7 @@ extern uint32_t _end; #define OPT_CHECK(opt) ((opts) & OPT_SET(opt)) static const char optstr[NOPT] = "agnrsv"; -static const unsigned char flags[NOPT] = { +static const unsigned char bootflags[NOPT] = { RBX_ASKNAME, RBX_GDB, RBX_NOINTR, @@ -265,7 +265,7 @@ parse() for (i = 0; c != optstr[i]; i++) if (i == NOPT - 1) return -1; - opts ^= OPT_SET(flags[i]); + opts ^= OPT_SET(bootflags[i]); } } else { arg--; -- cgit v1.3