summaryrefslogtreecommitdiffstats
path: root/gl/lib/fnmatch_loop.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-15 19:39:01 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-15 19:39:01 +0000
commit0feb9db220a276a2f8f29621dc8f04072bbfdd22 (patch)
tree926d3ec04fbe095eb6465e66c25c10c46aebd62c /gl/lib/fnmatch_loop.c
parentReleasing progress-linux version 2.12.0-4~progress7.99u1. (diff)
downloadman-db-0feb9db220a276a2f8f29621dc8f04072bbfdd22.tar.xz
man-db-0feb9db220a276a2f8f29621dc8f04072bbfdd22.zip
Merging upstream version 2.12.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'gl/lib/fnmatch_loop.c')
-rw-r--r--gl/lib/fnmatch_loop.c8
1 files changed, 4 insertions, 4 deletions
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