diff options
author | Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> | 2024-11-10 00:06:06 +0100 |
---|---|---|
committer | Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> | 2024-11-10 00:06:06 +0100 |
commit | 21c39515903c34bc6428a544c88cf1c100786847 (patch) | |
tree | c9d0465e24cc3148c84c2fee191f2b1bfc71b841 /gl/mbrtowc.c | |
parent | ed01d534474cc640515f1d5155349f14090aafe9 (diff) | |
parent | 5d7d620903a2fb40f8cd3140081bfb7ceaf125d5 (diff) | |
download | monitoring-plugins-21c39515903c34bc6428a544c88cf1c100786847.tar.gz |
Merge branch 'master' into check_swap_again
Diffstat (limited to 'gl/mbrtowc.c')
-rw-r--r-- | gl/mbrtowc.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gl/mbrtowc.c b/gl/mbrtowc.c index c1a689a2..8a1646d2 100644 --- a/gl/mbrtowc.c +++ b/gl/mbrtowc.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* Convert multibyte character to wide character. | 1 | /* Convert multibyte character to wide character. |
2 | Copyright (C) 1999-2002, 2005-2023 Free Software Foundation, Inc. | 2 | Copyright (C) 1999-2002, 2005-2024 Free Software Foundation, Inc. |
3 | Written by Bruno Haible <bruno@clisp.org>, 2008. | 3 | Written by Bruno Haible <bruno@clisp.org>, 2008. |
4 | 4 | ||
5 | This file is free software: you can redistribute it and/or modify | 5 | This file is free software: you can redistribute it and/or modify |
@@ -28,7 +28,11 @@ | |||
28 | # include <stdint.h> | 28 | # include <stdint.h> |
29 | # include <stdlib.h> | 29 | # include <stdlib.h> |
30 | 30 | ||
31 | # if defined _WIN32 && !defined __CYGWIN__ | 31 | # if AVOID_ANY_THREADS |
32 | |||
33 | /* The option '--disable-threads' explicitly requests no locking. */ | ||
34 | |||
35 | # elif defined _WIN32 && !defined __CYGWIN__ | ||
32 | 36 | ||
33 | # define WIN32_LEAN_AND_MEAN /* avoid including junk */ | 37 | # define WIN32_LEAN_AND_MEAN /* avoid including junk */ |
34 | # include <windows.h> | 38 | # include <windows.h> |