diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 08:56:12 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 08:56:12 +0000 |
commit | 5fc9e0f4acbb0647b6564d091257340b4ce800f1 (patch) | |
tree | 7c2ae9ffc1d5f93f36444e153ddaed2434612f9e /lib/mbtowc-lock.h | |
parent | Releasing progress-linux version 1.21.4-1~progress7.99u1. (diff) | |
download | wget-5fc9e0f4acbb0647b6564d091257340b4ce800f1.tar.xz wget-5fc9e0f4acbb0647b6564d091257340b4ce800f1.zip |
Merging upstream version 1.24.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'lib/mbtowc-lock.h')
-rw-r--r-- | lib/mbtowc-lock.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/mbtowc-lock.h b/lib/mbtowc-lock.h index 2dc22ac..10f7dc7 100644 --- a/lib/mbtowc-lock.h +++ b/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. */ |