diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2024-03-24 08:54:48 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2024-03-24 08:54:48 +0100 |
| commit | 163a663518f33bab48b28431972e580b366b4d49 (patch) | |
| tree | f518ffabaca4a0b93f0103d617e803792d3b0b43 /lib/mbrtowc.c | |
| parent | 1b3a8d5ad2ea2f099d514d9dd51ebf926a628076 (diff) | |
| parent | dd0000f7e25abe6c28d4329d324fd7fcab54094f (diff) | |
Merge branch 'release/debian/1.2-1'HEADdebian/1.2-1master
Diffstat (limited to 'lib/mbrtowc.c')
| -rw-r--r-- | lib/mbrtowc.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/mbrtowc.c b/lib/mbrtowc.c index be6fdc64..8a1646d2 100644 --- a/lib/mbrtowc.c +++ b/lib/mbrtowc.c @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2022 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2005-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This file is free software: you can redistribute it and/or modify @@ -28,7 +28,11 @@ # include <stdint.h> # include <stdlib.h> -# 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> |