From nobody Sat Oct 21 14:35:46 2023 X-Original-To: dev-commits-src-all@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 4SCPBp6tMNz4y5Mx; Sat, 21 Oct 2023 14:35:46 +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 4SCPBp5sZ3z4J44; Sat, 21 Oct 2023 14:35:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898946; 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=5vTUzX7UHjHP/rcRDmQH1kb9fWxDsJUrcEruKrJeAzc=; b=POmhU3e6F8MTTmTjcr27e6zcgHRebnUFaV9Uv3BcwViFRkJoG1S7jAg1xvxGJD5hk8010S tqCO4s/szMf5kmjYKFXdgt0YZm2f8uCKWnsnxKUq9hvoTt9Z9J4o7E7iJXBttFZj0O/zHX u90uCHPnU8moEGfY5femx0614q9NzRekFfS2kJCKg1uhGnZ/CKavZJzHVM1pDK++ueqqGM FcrQOyfMZ2N38fhHugpfeUiKbqyTUAbiQG7ADA2I38P8vLscFsinkjCDnI2Ju9rpQVCi5/ nNtSto6s7XGX4DzRUN4AaTa2HZR9trCefQHKRiSqMLbU4NVghx8KPlELZ10E5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697898946; a=rsa-sha256; cv=none; b=q0q3n235/qoZt1HkO4O2WX/Jw64RHxrUoWS+smQjD499tQVZN2TVzRjWdC6WWfOir6u+IL xh/QHvpxnZG9AXx5gyQE88UYPOwqeRJSL+gq2FIU4sSWB/d/klZM6u9nMCOC9R3YbUY1AN zsNypi34mklkbY9WgVGL4LwHWxuFiE2kcb/iEUfdPEVAjrlh3KBttz6bw4Th7dFAN7pdGj K+w0DLwOuRyO6Hg8qfm3SQlFVCjkBqRysG8xIRGD455PEs1qLtj5/ZBs2OJIxbR0nQzPxT E8je7snBCfoAt4RBX9thyKeZg/5sM0WZbtL3rZywea1VTm/Z87eLhvNcx4b7LQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898946; 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=5vTUzX7UHjHP/rcRDmQH1kb9fWxDsJUrcEruKrJeAzc=; b=PcwGoLTvYg2wP5HyYoAl3YLilosJ2pDYb66a/mrzPDj+PAiESA0snHHjS3hoB3fkjHBeHm ap2qaHNqWYBmPp/gJdHD/r04pQxkQUWMdVsqYAV002OPjzKtPl61gahCDixTkPq2IjlP8A 2UZommZBC8vdVtHqYhm/TCWVMyWEZCV+Dc1a+FPWKnWiAqP9YMWVTCweJ3h54mlFdnkSa+ 09FO0CSTZdbBLG/0H9mafB3vTSNknoW7Q97jhlZ0lkHCH4RDyeuuO3xmnU+5vcM6egjYHl bvBLXjLjQm/8IpI3laZHRJei60Rp8WvBIf1hmipF/Ly0tv4uW8jBkG3UrjEb+Q== 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 4SCPBp4pSMz4YY; Sat, 21 Oct 2023 14:35:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39LEZkWw087562; Sat, 21 Oct 2023 14:35:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LEZk8t087559; Sat, 21 Oct 2023 14:35:46 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:35:46 GMT Message-Id: <202310211435.39LEZk8t087559@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 0514cca9e44c - stable/13 - teken: use __bitcount() instead of bitcount() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0514cca9e44c80e098efd5bdcf461b9e0c36fdfb Auto-Submitted: auto-generated The branch stable/13 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0514cca9e44c80e098efd5bdcf461b9e0c36fdfb commit 0514cca9e44c80e098efd5bdcf461b9e0c36fdfb Author: Christos Margiolis AuthorDate: 2023-10-07 21:36:59 +0000 Commit: Christos Margiolis CommitDate: 2023-10-21 14:34:21 +0000 teken: use __bitcount() instead of bitcount() The use of bitcount() triggered a build error because it couldn't be located. __bitcount() on the other hand is defined in sys/types.h, which is included in teken/teken.h. MFC after: 2 weeks (cherry picked from commit 6d3296f16a06bcaa49918799e683936711dcf9c9) --- sys/teken/teken_wcwidth.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/teken/teken_wcwidth.h b/sys/teken/teken_wcwidth.h index f5a23dbc9679..bc992e1ef5d8 100644 --- a/sys/teken/teken_wcwidth.h +++ b/sys/teken/teken_wcwidth.h @@ -129,7 +129,7 @@ teken_utf8_bytes_to_codepoint(uint8_t bytes[4], int nbytes) { /* Check for malformed characters. */ - if (bitcount(bytes[0] & 0xf0) != nbytes) + if (__bitcount(bytes[0] & 0xf0) != nbytes) return (TEKEN_UTF8_INVALID_CODEPOINT); switch (nbytes) {