Date: Fri, 6 Apr 2018 21:40:24 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r332155 - stable/11/stand/common Message-ID: <201804062140.w36LeOpa094496@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804062140.w36LeOpa094496>