From nobody Sun Oct 22 11:57:37 2023 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 4SCxds2XG9z4xC3H; Sun, 22 Oct 2023 11:57:37 +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 4SCxds1l71z3WS1; Sun, 22 Oct 2023 11:57:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697975857; 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=rjaTXB9NT4TYLasYquLVs+ZaluHFxYCgTDnqSMfOiI4=; b=q/SlXjoToWVqtsWDIJcBEIbYDOpMZAeJsnxSOYY0NX/qe5/SadzTJbyE/LIbi4yQzSzgXP d0O4ZzHApHsNN11Gy+OBrWVyn+Zau2gqVpRswzlAz2hROCmK5AWAlg4cmKYLn/ON9571gx x+DI5xJbrZMopTQEJp5Ir4RtAK2FjGp73qQAAwi+7s0Ga0128VL0YEr3b/Bv4RDQtB2PAE F7eg/QL/D1CoLfnpDmrxCe8dGdHsVyKcntqyDgq+q5RbHHKLhcEhrn/wZHiKb0CACK5dLv lLwTPAgWQ3c/5M6PAstP6gVGmQyHcKoDgEFVlS0ZB4tmh85Delqz6+RNv9xdfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697975857; a=rsa-sha256; cv=none; b=YpPCSlkXNCu0wth1ZXQE9N6Rels5HOXg3sAfWSpl6CD5GNfH62rbIc2DMGL2/QoFq50TOg 6QyaFfHqUS3v9jLKr40PHEbpx7a69mwgQrP7m+zPkwKPCpEKgUwtsB/G0M49AgiIaklHdy stTffUuUSaI7mbvYf5hOdSQ3PsHHkh11XCExOPftzYEmvGs0SSInuALArNxR6XQu8EVLIY +whWXdswiefv1g7dIjgD3acNhTM7El4lWCM4AJeRsk5/l1tjWA+2xmk1gGCeAo2V+2pZpd drbtKn9rmer1vpH652Mv8FJCgxdC791Ai/hLz4TFYzKxIPvSpuZUZvbs1QTD8w== 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=1697975857; 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=rjaTXB9NT4TYLasYquLVs+ZaluHFxYCgTDnqSMfOiI4=; b=b2WSkagYoXySFelo6W32oYVMgDeMLD+28WwM1GzfJD1hElsgz1sV7wBokj7/1cAc4WhIB0 Wd7Q2Tz12h7q/O3CSj9gSGzQqLspVfhE7Nj2xwGwMrysuaDyhspuDYmI6oOd9AQJBZ/MAu 63VyiVH2OLtMHVFn4DbMqH4WB/8DsHNQo6jJQeodBD7qalwV59+mksg6xLNdmaqMQziqK1 HVo7XiiFa4MXb72VBEz+wqTgInLau8HG/+nykqj/ZR3evgeXtkSNh29ewzWP5CLaUWkSWU koe9StQoL04dheHbR5HuSAfWJOzM8rBJ3IS5N52ohTdx2J+quH8duScJ9vTvUQ== 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 4SCxds0rxRzwnG; Sun, 22 Oct 2023 11:57:37 +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 39MBvb3e015298; Sun, 22 Oct 2023 11:57:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MBvb1I015295; Sun, 22 Oct 2023 11:57:37 GMT (envelope-from git) Date: Sun, 22 Oct 2023 11:57:37 GMT Message-Id: <202310221157.39MBvb1I015295@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: e76fb470ab34 - releng/14.0 - teken: use __bitcount() instead of bitcount() 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: e76fb470ab34c035b78d2dcc5f346db1b72b19a6 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e76fb470ab34c035b78d2dcc5f346db1b72b19a6 commit e76fb470ab34c035b78d2dcc5f346db1b72b19a6 Author: Christos Margiolis AuthorDate: 2023-10-07 21:36:59 +0000 Commit: Christos Margiolis CommitDate: 2023-10-22 11:56:49 +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) Approved by: re (gjb) --- 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) {