summaryrefslogtreecommitdiffstats
path: root/gl/lib/mbtowc-lock.h
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-15 19:38:58 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-15 19:38:58 +0000
commit54a043ffd13f3d896b58c6a9f0a4a5bb2170b9ab (patch)
tree1d8aa5f85a9450353ec3fdaaa5100f60c2d6478e /gl/lib/mbtowc-lock.h
parentAdding debian version 2.12.0-4. (diff)
downloadman-db-54a043ffd13f3d896b58c6a9f0a4a5bb2170b9ab.tar.xz
man-db-54a043ffd13f3d896b58c6a9f0a4a5bb2170b9ab.zip
Merging upstream version 2.12.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'gl/lib/mbtowc-lock.h')
-rw-r--r--gl/lib/mbtowc-lock.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/gl/lib/mbtowc-lock.h b/gl/lib/mbtowc-lock.h
index 2dc22ac..10f7dc7 100644
--- a/gl/lib/mbtowc-lock.h
+++ b/gl/lib/mbtowc-lock.h
@@ -1,5 +1,5 @@
/* Use the internal lock used by mbrtowc and mbrtoc32.
- Copyright (C) 2019-2023 Free Software Foundation, Inc.
+ Copyright (C) 2019-2024 Free Software Foundation, Inc.
This file is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
@@ -21,7 +21,7 @@
static inline int
mbtowc_unlocked (wchar_t *pwc, const char *p, size_t m)
{
- /* Put the hidden internal state of mbtowc into its initial state.
+ /* Put the hidden internal state of mbtowc into an initial state.
This is needed at least with glibc, uClibc, and MSVC CRT.
See <https://sourceware.org/bugzilla/show_bug.cgi?id=9674>. */
mbtowc (NULL, NULL, 0);
@@ -32,7 +32,7 @@ mbtowc_unlocked (wchar_t *pwc, const char *p, size_t m)
/* Prohibit renaming this symbol. */
#undef gl_get_mbtowc_lock
-#if GNULIB_MBRTOWC_SINGLE_THREAD
+#if AVOID_ANY_THREADS || GNULIB_MBRTOWC_SINGLE_THREAD
/* All uses of this function are in a single thread. No locking needed. */