From f5b6b735a731901f09d7f3cc153c1d869269ee83 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 21:38:57 +0200 Subject: Adding upstream version 2.12.1. Signed-off-by: Daniel Baumann --- gl/lib/fnmatch_loop.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gl/lib/fnmatch_loop.c') diff --git a/gl/lib/fnmatch_loop.c b/gl/lib/fnmatch_loop.c index 68a3b7a..4e6e086 100644 --- a/gl/lib/fnmatch_loop.c +++ b/gl/lib/fnmatch_loop.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2023 Free Software Foundation, Inc. +/* Copyright (C) 1991-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -270,7 +270,7 @@ FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end, /* Leave room for the null. */ CHAR str[CHAR_CLASS_MAX_LENGTH + 1]; size_t c1 = 0; - wctype_t wt; + WCTYPE_T wt; const CHAR *startp = p; for (;;) @@ -310,7 +310,7 @@ FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end, if (_ISCTYPE ((UCHAR) *n, wt)) goto matched; #else - if (iswctype (BTOWC ((UCHAR) *n), wt)) + if (ISWCTYPE (UCHAR_TO_WCHAR ((UCHAR) *n), wt)) goto matched; #endif c = *p++; @@ -1206,6 +1206,6 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end, #undef STRLEN #undef STRCAT #undef L_ -#undef BTOWC +#undef UCHAR_TO_WCHAR #undef WIDE_CHAR_VERSION #undef FINDIDX -- cgit v1.2.3