diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 19:38:58 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 19:38:58 +0000 |
| commit | 54a043ffd13f3d896b58c6a9f0a4a5bb2170b9ab (patch) | |
| tree | 1d8aa5f85a9450353ec3fdaaa5100f60c2d6478e /gl/lib/nl_langinfo.c | |
| parent | Adding debian version 2.12.0-4. (diff) | |
| download | man-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/nl_langinfo.c')
| -rw-r--r-- | gl/lib/nl_langinfo.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/gl/lib/nl_langinfo.c b/gl/lib/nl_langinfo.c index f872c6d..2a6be82 100644 --- a/gl/lib/nl_langinfo.c +++ b/gl/lib/nl_langinfo.c @@ -1,6 +1,6 @@ /* nl_langinfo() replacement: query locale dependent information. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-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 @@ -30,7 +30,12 @@ #endif #if REPLACE_NL_LANGINFO && !NL_LANGINFO_MTSAFE -# if defined _WIN32 && !defined __CYGWIN__ + +# if AVOID_ANY_THREADS + +/* The option '--disable-threads' explicitly requests no locking. */ + +# elif defined _WIN32 && !defined __CYGWIN__ # define WIN32_LEAN_AND_MEAN /* avoid including junk */ # include <windows.h> @@ -51,6 +56,7 @@ # include <threads.h> # endif + #endif /* nl_langinfo() must be multithread-safe. To achieve this without using @@ -186,7 +192,12 @@ nl_langinfo_unlocked (nl_item item) /* Prohibit renaming this symbol. */ # undef gl_get_nl_langinfo_lock -# if defined _WIN32 && !defined __CYGWIN__ +# if AVOID_ANY_THREADS + +/* The option '--disable-threads' explicitly requests no locking. */ +# define nl_langinfo_with_lock nl_langinfo_unlocked + +# elif defined _WIN32 && !defined __CYGWIN__ extern __declspec(dllimport) CRITICAL_SECTION *gl_get_nl_langinfo_lock (void); |