summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2018-01-01 20:24:16 +0000
committerLuiz Souza <luiz@netgate.com>2018-02-21 15:19:44 -0300
commit7f33f93bf2f7c20161a5486c2d80c28c6152969a (patch)
tree6c5a07dca86d7cbb8763d97d5d83b5a2d0c22c01
parentec9fc666d7930ca3c4404c65f66b1058774bc764 (diff)
downloadFreeBSD-src-7f33f93bf2f7c20161a5486c2d80c28c6152969a.zip
FreeBSD-src-7f33f93bf2f7c20161a5486c2d80c28c6152969a.tar.gz
MFC r327167:
Remove obsolete register keyword from opensolaris's sysmacros.h. When compiling zfsd with recent clang, it leads to a warning about the register storage class being incompatible with C++17. (cherry picked from commit 016480dfbf6cf81626fb8c9cb4827635b58cdd12)
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h b/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
index aa84f36..ee6e552 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
@@ -388,7 +388,7 @@ highbit(ulong_t i)
#if defined(__FreeBSD__) && defined(_KERNEL) && defined(HAVE_INLINE_FLSL)
return (flsl(i));
#else
- register int h = 1;
+ int h = 1;
if (i == 0)
return (0);
OpenPOWER on IntegriCloud