svn commit: r332155 - stable/11/stand/common

[Kyle Evans]

Author: kevans
Date: Fri Apr  6 21:40:23 2018
New Revision: 332155
URL: https://svnweb.freebsd.org/changeset/base/332155

Log:
  MFC r331331: Apply r228478 (CTASSERT => _Static_assert()) to bootstrap.h

Modified:
  stable/11/stand/common/bootstrap.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/stand/common/bootstrap.h
==============================================================================
--- stable/11/stand/common/bootstrap.h	Fri Apr  6 21:37:25 2018	(r332154)
+++ stable/11/stand/common/bootstrap.h	Fri Apr  6 21:40:23 2018	(r332155)
@@ -330,10 +330,8 @@ 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]
+#ifndef CTASSERT
+#define	CTASSERT(x)	_Static_assert(x, "compile-time assertion failed")
 #endif
 
 #endif /* !_BOOTSTRAP_H_ */