From owner-svn-src-head@FreeBSD.ORG  Sat Jul 26 04:09:44 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 881A1696;
 Sat, 26 Jul 2014 04:09:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7538B2F76;
 Sat, 26 Jul 2014 04:09:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6Q49iH2065579;
 Sat, 26 Jul 2014 04:09:44 GMT (envelope-from ian@svn.freebsd.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6Q49i20065578;
 Sat, 26 Jul 2014 04:09:44 GMT (envelope-from ian@svn.freebsd.org)
Message-Id: <201407260409.s6Q49i20065578@svn.freebsd.org>
From: Ian Lepore <ian@FreeBSD.org>
Date: Sat, 26 Jul 2014 04:09:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269112 - head/sys/boot/arm/at91/boot2
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Jul 2014 04:09:44 -0000

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--;