From owner-svn-src-stable@FreeBSD.ORG  Fri Jun 29 09:56:23 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 620D11065813;
	Fri, 29 Jun 2012 09:56:23 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4C7C18FC0A;
	Fri, 29 Jun 2012 09:56:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5T9uNsk032260;
	Fri, 29 Jun 2012 09:56:23 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5T9uNJg032257;
	Fri, 29 Jun 2012 09:56:23 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201206290956.q5T9uNJg032257@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Fri, 29 Jun 2012 09:56:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237754 - in stable/8/sys/boot: common sparc64/loader
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Jun 2012 09:56:23 -0000

Author: avg
Date: Fri Jun 29 09:56:22 2012
New Revision: 237754
URL: http://svn.freebsd.org/changeset/base/237754

Log:
  MFC r235153: sys/boot: add common CTASSERT definition

Modified:
  stable/8/sys/boot/common/bootstrap.h
  stable/8/sys/boot/sparc64/loader/main.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/boot/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/e1000/   (props changed)

Modified: stable/8/sys/boot/common/bootstrap.h
==============================================================================
--- stable/8/sys/boot/common/bootstrap.h	Fri Jun 29 09:41:09 2012	(r237753)
+++ stable/8/sys/boot/common/bootstrap.h	Fri Jun 29 09:56:22 2012	(r237754)
@@ -311,4 +311,10 @@ void	dev_cleanup(void);
 
 time_t	time(time_t *tloc);
 
+#ifndef CTASSERT                /* Allow lint to override */
+#define CTASSERT(x)             _CTASSERT(x, __LINE__)
+#define _CTASSERT(x, y)         __CTASSERT(x, y)
+#define __CTASSERT(x, y)        typedef char __assert ## y[(x) ? 1 : -1]
+#endif
+
 #endif /* !_BOOTSTRAP_H_ */

Modified: stable/8/sys/boot/sparc64/loader/main.c
==============================================================================
--- stable/8/sys/boot/sparc64/loader/main.c	Fri Jun 29 09:41:09 2012	(r237753)
+++ stable/8/sys/boot/sparc64/loader/main.c	Fri Jun 29 09:56:22 2012	(r237754)
@@ -74,12 +74,6 @@ __FBSDID("$FreeBSD$");
 #include "libofw.h"
 #include "dev_net.h"
 
-#ifndef CTASSERT
-#define	CTASSERT(x)		_CTASSERT(x, __LINE__)
-#define	_CTASSERT(x, y)		__CTASSERT(x, y)
-#define	__CTASSERT(x, y)	typedef char __assert ## y[(x) ? 1 : -1]
-#endif
-
 extern char bootprog_name[], bootprog_rev[], bootprog_date[], bootprog_maker[];
 
 enum {