From nobody Fri Jan 14 18:10:29 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E30F71942D16; Fri, 14 Jan 2022 18:10:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jb8VG4GCSz4pP9; Fri, 14 Jan 2022 18:10:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642183830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ZqqNkpJuVW55V8FPOADYAWSSftrRXhdQEO5IkJVR7k=; b=YxGy5sn+Fx270cTEQLIW367Mjfk/C4Bk/taeuiiZjbBTgNZai776wTsO+UyXZydpL4VxNJ 3xvQcLPWZiHGQtoV3rK8THWaViZ3Q6ARExfjsFMT9QDlStUYMQUzum3JhIyP7iUzUrfMdI P9Ynw8Ecz+LRDMnceLVg7aiqA6djgXk1x7MMIt+IQ4niqBvxShdR7LFK4zs2FmC1Ddkgib 5vYzUxkOkIawzY3x1NFYJhrPRQsHk5riuUaQGlfBrNy6p9VXr2ou0lxjDo6pqLqElnbgLu MQDVIPch6PGSwiqWClTfwUcyTwjZszSQOw4zonCxBlCrJzHjc0CqORJmjggh6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4188A18576; Fri, 14 Jan 2022 18:10:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20EIATgD095533; Fri, 14 Jan 2022 18:10:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20EIATQ2095532; Fri, 14 Jan 2022 18:10:29 GMT (envelope-from git) Date: Fri, 14 Jan 2022 18:10:29 GMT Message-Id: <202201141810.20EIATQ2095532@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: fddbba918dc7 - stable/13 - sys/_bitset.h: Fix fall-out from commit 5e04571cf3c List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fddbba918dc74f860348775c6c68107c59b12a11 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642183830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ZqqNkpJuVW55V8FPOADYAWSSftrRXhdQEO5IkJVR7k=; b=hPdtcDUy6dstrQxSkOEYa3YdmFfzwy0IWsou2THNWpm1k1aBYbah+VbYvnnVQVIeLZx1ho 1c8eYZsGHCuTDZmV11i0YhNCMgTAue6UapJXw5pVOti/9BaJjmpZR+87l4pEAStbShcKy9 a3xhjKlmWlLE1vS8KDbs7vpTw7ul0ew/cnDYRE/opB6TRWN9idGOJ2D+TEqEXTUnLSb1RN 4s8r3RdhJixaRR011YWuR262htFES/hwWXZdiu7c1mghl53gwYEh3wuDDZE1VLMEFj6+PL mNM8r3LPbDPDpMvTJhLW3NP875BwVJuvXRPQVJgVWow9Q0gFCWs5yjRrff9OWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642183830; a=rsa-sha256; cv=none; b=LdgD/T9mh6jFvsWTJADDIinV+RhNBHCK/BuIeFy6Ra7zeotZ0blWGHvHN2nIDmdFavYVr8 gyWwyQxbr0cir4h9Vu61yCRJ6LXBpz7O1OvjhvJXpCZMlALBHVK4nfiIarHeHaTn/6rNof JoYsHxYD0ZOQaJyY2iD/532/h5Bi7a1bUE/VuHSiuWfw4962Tb3ncPYMIV1zS/pVdVRuVa lP+sTdclfVUF1vqZbr/Jcu+ckfOBLmXINZHZhzdLq3pBjfE7Z8SoBOghrjgmqWO0X/F03i otLtbt1nlvKgUvR1lpFp2liKDLT5ZWivaAoDlxQacSdFyu4zzLM0JuZqyVo78A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fddbba918dc74f860348775c6c68107c59b12a11 commit fddbba918dc74f860348775c6c68107c59b12a11 Author: Stefan Eßer AuthorDate: 2021-12-08 07:47:42 +0000 Commit: Konstantin Belousov CommitDate: 2022-01-14 16:17:30 +0000 sys/_bitset.h: Fix fall-out from commit 5e04571cf3c (cherry picked from commit 49c2c62889b06d781c5e1f96bce0e26fd21ceb04) --- sys/sys/_bitset.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/sys/_bitset.h b/sys/sys/_bitset.h index 1c167daf3f09..70b9713ffada 100644 --- a/sys/sys/_bitset.h +++ b/sys/sys/_bitset.h @@ -52,7 +52,7 @@ struct _t { \ /* * Helper to declare a bitset without it's size being a constant. * - * Sadly we cannot declare a bitset struct with '__bits[]', because it's + * Sadly we cannot declare a bitset struct with 'bits[]', because it's * the only member of the struct and the compiler complains. */ #define __BITSET_DEFINE_VAR(_t) __BITSET_DEFINE(_t, 1) @@ -61,11 +61,12 @@ struct _t { \ * Define a default type that can be used while manually specifying size * to every call. */ -__BITSET_DEFINE(bitset, 1); #if defined(_KERNEL) || defined(_WANT_FREEBSD_BITSET) +__BITSET_DEFINE(bitset, 1); + #define BITSET_DEFINE(_t, _s) __BITSET_DEFINE(_t, _s) #define BITSET_DEFINE_VAR(_t) __BITSET_DEFINE_VAR(_t) -#endif +#endif /* defined(_KERNEL) || defined(_WANT_FREEBSD_BITSET) */ #endif /* !_SYS__BITSET_H_ */