From 244faaea8e24c70a1d61b939623364e3bdfaa28c Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 20 Feb 2023 22:47:17 +0100 Subject: [PATCH] Cygwin: glob: convert internal character datatype to wint_t uint_fast64_t doesn't allow easy string handling, so convert the internal "Char" type to wint_t. Given that UTF-32 only needs 21 bits, we're well off with 28 usable character bits. Signed-off-by: Corinna Vinschen --- winsup/cygwin/glob.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/winsup/cygwin/glob.cc b/winsup/cygwin/glob.cc index b84c36fcc..4ef947929 100644 --- a/winsup/cygwin/glob.cc +++ b/winsup/cygwin/glob.cc @@ -130,12 +130,13 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.28 2010/05/12 17:44:00 gordon Ex #ifndef DEBUG -#define M_QUOTE 0x8000000000ULL -#define M_PROTECT 0x4000000000ULL -#define M_MASK 0xffffffffffULL -#define M_CHAR 0x00ffffffffULL +#define M_QUOTE 0x40000000U +#define M_PROTECT 0x20000000U +#define M_MASK 0x70ffffffU +#define M_COLL_MASK 0x700000ffU +#define M_CHAR 0x0fffffffU -typedef uint_fast64_t Char; +typedef wint_t Char; #else