svn commit: r269112 - head/sys/boot/arm/at91/boot2

[Ian Lepore]

Author: ian
Date: Sat Jul 26 04:09:43 2014
New Revision: 269112
URL: http://svnweb.freebsd.org/changeset/base/269112

Log:
  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.

Modified:
  head/sys/boot/arm/at91/boot2/boot2.c

Modified: head/sys/boot/arm/at91/boot2/boot2.c
==============================================================================
--- head/sys/boot/arm/at91/boot2/boot2.c	Sat Jul 26 03:33:19 2014	(r269111)
+++ head/sys/boot/arm/at91/boot2/boot2.c	Sat Jul 26 04:09:43 2014	(r269112)
@@ -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--;