d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The 'flags' variable is conflicting with some inline code in a header file

Browse Source 
("variable flags shadows a global..."), just rename this variable to
wish away the problem.
This commit is contained in:
ian 2014-07-26 04:09:43 +00:00
parent f6430fb275
commit f85cf0d80f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/boot/arm/at91/boot2/boot2.c
View File

@ -77,7 +77,7 @@ extern uint32_t _end;
#define OPT_CHECK(opt) ((opts) & OPT_SET(opt)) #define OPT_CHECK(opt) ((opts) & OPT_SET(opt))
static const char optstr[NOPT] = "agnrsv"; static const char optstr[NOPT] = "agnrsv";
static const unsigned char flags[NOPT] = { static const unsigned char bootflags[NOPT] = {
RBX_ASKNAME, RBX_ASKNAME,
RBX_GDB, RBX_GDB,
RBX_NOINTR, RBX_NOINTR,
@ -265,7 +265,7 @@ parse()
for (i = 0; c != optstr[i]; i++) for (i = 0; c != optstr[i]; i++)
if (i == NOPT - 1) if (i == NOPT - 1)
return -1; return -1;
opts ^= OPT_SET(flags[i]); opts ^= OPT_SET(bootflags[i]);
} }
} else { } else {
arg--; arg--;