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 {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
