From owner-svn-src-all@FreeBSD.ORG  Sat Mar 21 16:16:19 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 44C2B94F;
 Sat, 21 Mar 2015 16:16:19 +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 309268E9;
 Sat, 21 Mar 2015 16:16:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2LGGINQ087790;
 Sat, 21 Mar 2015 16:16:18 GMT (envelope-from cognet@FreeBSD.org)
Received: (from cognet@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2LGGIU2087789;
 Sat, 21 Mar 2015 16:16:18 GMT (envelope-from cognet@FreeBSD.org)
Message-Id: <201503211616.t2LGGIU2087789@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: cognet set sender to
 cognet@FreeBSD.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Sat, 21 Mar 2015 16:16:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280325 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Mar 2015 16:16:19 -0000

Author: cognet
Date: Sat Mar 21 16:16:17 2015
New Revision: 280325
URL: https://svnweb.freebsd.org/changeset/base/280325

Log:
  error is only used if MAC is defined, so make its declaration conditional
  as well.

Modified:
  head/sys/kern/sysv_shm.c

Modified: head/sys/kern/sysv_shm.c
==============================================================================
--- head/sys/kern/sysv_shm.c	Sat Mar 21 15:32:59 2015	(r280324)
+++ head/sys/kern/sysv_shm.c	Sat Mar 21 16:16:17 2015	(r280325)
@@ -596,7 +596,9 @@ shmget_existing(struct thread *td, struc
     int segnum)
 {
 	struct shmid_kernel *shmseg;
+#ifdef MAC
 	int error;
+#endif
 
 	SYSVSHM_ASSERT_LOCKED();
 	KASSERT(segnum >= 0 && segnum < shmalloced,