From nobody Tue Oct 20 08:12:11 2026 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 4j84rq3cYPz6wc4W for ; Tue, 20 Oct 2026 08:12:11 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j84rq2Wplz4FX5 for ; Tue, 20 Oct 2026 08:12:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792483931; 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=rxHhAy36M2IKRYmIv3kY/cqr+3af2WbmwfRjy59WMM8=; b=GQjvb7ClqCNd52OilOrp+7rg4KiKt/Se+hT8sOhHJUj4N8ii2qZZZ6NePOOD1GrLZ2NZHF iRNg+NR8qdfYomZoWJQWM1jaIg3t7xF5qXJa3ybABE8UtMyhD0y5Nbc1GDEis6j/G8dVtD kKpvGLmjlkr4JHEwsP1D/9Uh8BrVYm4JP1+cQpBFxpI6/YiNydoME2Qq21V+vAyQsk3oP+ fC2fZg6AI19DM/elJ5DVgIwuRueqNQflePR2DgOik+8BGLgEjsfW8r09z6qk1RSctPWQTL fl3V0Gp+LRcisdA76j5ASN5xXXuLumreb8yYK1SDE1yBu3netYC++QQyufUnpw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792483931; b=cp3kbdVNNl3RXs8ejnPbEDmFycUnWrMCDYTe9rsk+3sg4gphDKhCV8ep6eIP24ojVkCYL8 dR/NpXnz/sLksF6DGRfTnrHFEivfKV2OHmOVCx5Bb69rdLlMjNaAGTpskIp9p3VLoBtqfD Vv1GvbrFHeijrvFc6bNvsFnO1nMvu3p4WPlUyT8xOsLBQnaI6tRp8p/eXShmQmanuSbVmy FYtd9c4oUKx5DjvzYPXjBmP2SbuqYNLjb+Uehea2kzz2lpdSuAjVy00PxEaeRWsMzuKDM+ fxAAO8F2wSb3ndX7DsE9wz5KLU0Eur1GlhSIMSkSuWfvRa69QOqPuf3Yc1BBYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792483931; 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=rxHhAy36M2IKRYmIv3kY/cqr+3af2WbmwfRjy59WMM8=; b=XyObQz5Jwe1116fiB8iLW5rIUslCbzwWMi6JZnrcCb7ohrNsxLL7xISwQORBYWNWjvh6+G f/koh4L5zBLgOyJ1RlDNBZW8QXT7K0+8xEHG2qt++Ega9ViSZPrW73sFonz9BNZujREAiH kRDRHIaw4T+kwVnh+2CRPJNrCDr6EBWMRiv1gpOM8MWbGqdQdxbDDPwWqm532BaxYtWy4g fx7SbjKGhEt6tQR3mO+BSy6BOwT3P2ysAFKzVgTBjAve5mXZWk6talP3h9LkfMqF1Fq+Sm nK5450nzz3Kjm8/myZ6War5BLgQ8q5On+/0Qo5TwYPZuje6qgzc89vTIE/m+nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j84rq1vj6z10Dj for ; Tue, 20 Oct 2026 08:12:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42589 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Oct 2026 08:12:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Faraz Vahedi Subject: git: 13d25dc29879 - stable/15 - libc: Add WCHAR_WIDTH in as well List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kfv X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 13d25dc298793e333ca2efff85711b2406c09858 Auto-Submitted: auto-generated Date: Tue, 20 Oct 2026 08:12:11 +0000 Message-Id: <6ad7225b.42589.20415e21@gitrepo.freebsd.org> The branch stable/15 has been updated by kfv: URL: https://cgit.FreeBSD.org/src/commit/?id=13d25dc298793e333ca2efff85711b2406c09858 commit 13d25dc298793e333ca2efff85711b2406c09858 Author: Faraz Vahedi AuthorDate: 2026-09-05 10:41:22 +0000 Commit: Faraz Vahedi CommitDate: 2026-10-20 08:09:36 +0000 libc: Add WCHAR_WIDTH in as well Define __WCHAR_WIDTH in sys/_types.h and derive WCHAR_WIDTH from that, the same way as WCHAR_MIN and WCHAR_MAX, in both and as per C23 §7.31.1 and §7.22.3.4, respectively. Reviewed by: fuz Approved by: fuz (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D59385 (cherry picked from commit 72ed6f9c9dc95124cd81158d1c4437484a1b951e) --- include/wchar.h | 3 +++ sys/arm/include/_stdint.h | 1 - sys/arm64/include/_stdint.h | 1 - sys/powerpc/include/_stdint.h | 1 - sys/riscv/include/_stdint.h | 1 - sys/sys/_types.h | 2 ++ sys/sys/stdint.h | 3 +++ sys/x86/include/_stdint.h | 1 - 8 files changed, 8 insertions(+), 5 deletions(-) diff --git a/include/wchar.h b/include/wchar.h index 1447d083a889..d191981be5ff 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -97,6 +97,9 @@ typedef __wint_t wint_t; #define WCHAR_MIN __WCHAR_MIN #define WCHAR_MAX __WCHAR_MAX +#if __ISO_C_VISIBLE >= 2023 +#define WCHAR_WIDTH __WCHAR_WIDTH +#endif #ifndef WEOF #define WEOF ((wint_t)-1) diff --git a/sys/arm/include/_stdint.h b/sys/arm/include/_stdint.h index 9f9b7eb8a554..b0b92f8de72f 100644 --- a/sys/arm/include/_stdint.h +++ b/sys/arm/include/_stdint.h @@ -166,7 +166,6 @@ #define PTRDIFF_WIDTH INT32_WIDTH #define SIG_ATOMIC_WIDTH INT32_WIDTH #define SIZE_WIDTH INT32_WIDTH -#define WCHAR_WIDTH INT32_WIDTH #define WINT_WIDTH INT32_WIDTH #endif /* __ISO_C_VISIBLE >= 2023 */ diff --git a/sys/arm64/include/_stdint.h b/sys/arm64/include/_stdint.h index 621e5ce53721..1088ab383a35 100644 --- a/sys/arm64/include/_stdint.h +++ b/sys/arm64/include/_stdint.h @@ -168,7 +168,6 @@ #define PTRDIFF_WIDTH INT64_WIDTH #define SIG_ATOMIC_WIDTH INT64_WIDTH #define SIZE_WIDTH INT64_WIDTH -#define WCHAR_WIDTH INT32_WIDTH #define WINT_WIDTH INT32_WIDTH #endif /* __ISO_C_VISIBLE >= 2023 */ diff --git a/sys/powerpc/include/_stdint.h b/sys/powerpc/include/_stdint.h index 68ae89e23cdc..5423badb25a6 100644 --- a/sys/powerpc/include/_stdint.h +++ b/sys/powerpc/include/_stdint.h @@ -213,7 +213,6 @@ #define SIZE_WIDTH INT32_WIDTH #endif #define SIG_ATOMIC_WIDTH INT32_WIDTH -#define WCHAR_WIDTH INT32_WIDTH #define WINT_WIDTH INT32_WIDTH #endif /* __ISO_C_VISIBLE >= 2023 */ diff --git a/sys/riscv/include/_stdint.h b/sys/riscv/include/_stdint.h index 9afe01c8a318..3cfb78208aec 100644 --- a/sys/riscv/include/_stdint.h +++ b/sys/riscv/include/_stdint.h @@ -164,7 +164,6 @@ #define PTRDIFF_WIDTH INT64_WIDTH #define SIG_ATOMIC_WIDTH INT64_WIDTH #define SIZE_WIDTH INT64_WIDTH -#define WCHAR_WIDTH INT32_WIDTH #define WINT_WIDTH INT32_WIDTH #endif /* __ISO_C_VISIBLE >= 2023 */ diff --git a/sys/sys/_types.h b/sys/sys/_types.h index 02d01f86b298..1b69152fd2e3 100644 --- a/sys/sys/_types.h +++ b/sys/sys/_types.h @@ -108,6 +108,8 @@ typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */ */ #include +#define __WCHAR_WIDTH 32 /* number of bits in a wchar_t */ + /* * Standard type definitions. */ diff --git a/sys/sys/stdint.h b/sys/sys/stdint.h index dccc5a8e6a6d..661945c18281 100644 --- a/sys/sys/stdint.h +++ b/sys/sys/stdint.h @@ -68,6 +68,9 @@ typedef __uint_fast64_t uint_fast64_t; /* Limits of wchar_t. */ #define WCHAR_MIN __WCHAR_MIN #define WCHAR_MAX __WCHAR_MAX +#if __ISO_C_VISIBLE >= 2023 +#define WCHAR_WIDTH __WCHAR_WIDTH +#endif #if __EXT1_VISIBLE /* ISO/IEC 9899:2011 K.3.4.4 */ diff --git a/sys/x86/include/_stdint.h b/sys/x86/include/_stdint.h index 4c65b0f095ea..fa51cd27b8a8 100644 --- a/sys/x86/include/_stdint.h +++ b/sys/x86/include/_stdint.h @@ -207,7 +207,6 @@ #define SIG_ATOMIC_WIDTH INT32_WIDTH #define SIZE_WIDTH INT32_WIDTH #endif -#define WCHAR_WIDTH INT32_WIDTH #define WINT_WIDTH INT32_WIDTH #endif /* __ISO_C_VISIBLE >= 2023 */