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/stdint.in.h | |
| parent | ed01d534474cc640515f1d5155349f14090aafe9 (diff) | |
| parent | 5d7d620903a2fb40f8cd3140081bfb7ceaf125d5 (diff) | |
| download | monitoring-plugins-21c39515903c34bc6428a544c88cf1c100786847.tar.gz | |
Merge branch 'master' into check_swap_again
Diffstat (limited to 'gl/stdint.in.h')
| -rw-r--r-- | gl/stdint.in.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gl/stdint.in.h b/gl/stdint.in.h index 5ddc644b..fea7483b 100644 --- a/gl/stdint.in.h +++ b/gl/stdint.in.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* Copyright (C) 2001-2002, 2004-2023 Free Software Foundation, Inc. | 1 | /* Copyright (C) 2001-2002, 2004-2024 Free Software Foundation, Inc. |
| 2 | Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. | 2 | Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. |
| 3 | This file is part of gnulib. | 3 | This file is part of gnulib. |
| 4 | 4 | ||
| @@ -306,6 +306,8 @@ typedef gl_uint_fast32_t gl_uint_fast16_t; | |||
| 306 | uintptr_t to avoid conflicting declarations of system functions like | 306 | uintptr_t to avoid conflicting declarations of system functions like |
| 307 | _findclose in <io.h>. */ | 307 | _findclose in <io.h>. */ |
| 308 | # if !((defined __KLIBC__ && defined _INTPTR_T_DECLARED) \ | 308 | # if !((defined __KLIBC__ && defined _INTPTR_T_DECLARED) \ |
| 309 | || (defined __INTPTR_WIDTH__ \ | ||
| 310 | && __INTPTR_WIDTH__ != (defined _WIN64 ? LLONG_WIDTH : LONG_WIDTH)) \ | ||
| 309 | || defined __MINGW32__) | 311 | || defined __MINGW32__) |
| 310 | # undef intptr_t | 312 | # undef intptr_t |
| 311 | # undef uintptr_t | 313 | # undef uintptr_t |