From nobody Sat Oct 21 14:29:34 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 4SCP3g2QJyz4y5Km; Sat, 21 Oct 2023 14:29:35 +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 4SCP3g1LYbz4G1r; Sat, 21 Oct 2023 14:29:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898575; 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=g4VaYtnOtJ26OGtwl+XVhSZNXb9RoijzJX+2iEPLTO8=; b=pSQFxc/tkf2Ov6xdLFvDUzkFcedqDZ7iq222Ziyj3s0PFMvTDVq00XnhMRh30RbxqXA4Jr AsVc+60OfAZW3s81lI6EIAiL6z8NZQ+7oHlyEW36maL/Bxr5Q5Ethe/Jto6V+5wC3N1eCR TN40MmdqHuLJxzy17iSBBM59DB6oV0g2tDKfsbCWC8GeQDEykW8fUgVMhxrqCcfxsN8Hbi 6azRlBvmTPjS3ARmIrdu7GflLbjqKP/w0bQGuAE7D4i6vcaccDSt5CVz/DDU9u421iHizw +uA7UM3ttu2B92MwLouvIrx8Hbb9Ve6k0Z5kZa8IpmRL7GMtviO7dvpm1zC+6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697898575; a=rsa-sha256; cv=none; b=h6hehhgBYWKDJF2bH8I/rv6VWHvQ0N7kUA3IgJ3LFOvwEzbNEQHfgnaM4vWntvzVZhpT+g RoIdQbev22bBx/mpbJ2iFRrjY44exTOxDu4tIWtLDs3vj1jAg85TzcpxajDfIajolahsIg tvAap7k9z5pxfBJs+Jt+12nCmqzP1RSa6TXu1gTiLVZC2BLCfBvoJ3oKEZZBd5izodwfrR hysl+zc2+gsbppZYi6ZjELX0yaZgTXvydXRqUy+XzGHySxMCDPes20MUNP7EXaHn+zr7FG grvCFgoqLcEGQoddOrfHNNll+C/lt3RE/63WU4SUbGrbQVRpbVb1wyqzxWHQ2A== 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=1697898575; 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=g4VaYtnOtJ26OGtwl+XVhSZNXb9RoijzJX+2iEPLTO8=; b=ZUvlPSYz46aWSb83SuqLY8wVEuZZMYVOmAPua+9BKI2Tc93Rj+zqFZmjRzkdaW6WxcUjHV CozlVSY372kv/J3+Q4GZ1IRCj+5EL+Y467PtO5KGno5mHiupXg5NbAxJpUIk5xNNYttbCY SPs0CWrVoXYwtBisiKurkGzMPZ2ba9eIn6xwIkL8K1L69YyhkzyyPVrLq/hHd0tkfpDhtD 0d8gGVpFJ1XriDYxERxZ/MNYkOT2LfqqbxW3r855KMjzuXRhXb97Dz2Nls0dQL6GQQFo9o xFdeXy7oV09nACL2YqJ/9ch7STxcIqJPnV/BNUSbpN03Gq2P5qOCQzuayHR9Lg== 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 4SCP3g0Qt3z3y2; Sat, 21 Oct 2023 14:29:35 +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 39LETY7W071622; Sat, 21 Oct 2023 14:29:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LETY4e071619; Sat, 21 Oct 2023 14:29:34 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:29:34 GMT Message-Id: <202310211429.39LETY4e071619@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: dbe34ab6df0b - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: dbe34ab6df0b84335e207adcb331dc0c7f507cd4 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=dbe34ab6df0b84335e207adcb331dc0c7f507cd4 commit dbe34ab6df0b84335e207adcb331dc0c7f507cd4 Author: Christos Margiolis AuthorDate: 2023-10-07 21:36:59 +0000 Commit: Christos Margiolis CommitDate: 2023-10-21 14:28:34 +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) {