diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 19:38:57 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 19:38:57 +0000 |
| commit | f5b6b735a731901f09d7f3cc153c1d869269ee83 (patch) | |
| tree | 565a1b0f3c6a4094a5f2198879fb239053549f1e /gl/lib/xalloc-oversized.h | |
| parent | Adding upstream version 2.12.0. (diff) | |
| download | man-db-f5b6b735a731901f09d7f3cc153c1d869269ee83.tar.xz man-db-f5b6b735a731901f09d7f3cc153c1d869269ee83.zip | |
Adding upstream version 2.12.1.upstream/2.12.1upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'gl/lib/xalloc-oversized.h')
| -rw-r--r-- | gl/lib/xalloc-oversized.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gl/lib/xalloc-oversized.h b/gl/lib/xalloc-oversized.h index 5dbdfb5..0b7bb2c 100644 --- a/gl/lib/xalloc-oversized.h +++ b/gl/lib/xalloc-oversized.h @@ -1,6 +1,6 @@ /* xalloc-oversized.h -- memory allocation size checking - Copyright (C) 1990-2000, 2003-2004, 2006-2023 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2003-2004, 2006-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 @@ -48,13 +48,13 @@ #if 7 <= __GNUC__ && !defined __clang__ && PTRDIFF_MAX < SIZE_MAX # define xalloc_oversized(n, s) \ __builtin_mul_overflow_p (n, s, (ptrdiff_t) 1) -#elif (5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__ \ - && PTRDIFF_MAX < SIZE_MAX) +#elif 5 <= __GNUC__ && !defined __ICC && PTRDIFF_MAX < SIZE_MAX # define xalloc_oversized(n, s) \ (__builtin_constant_p (n) && __builtin_constant_p (s) \ ? __xalloc_oversized (n, s) \ - : ({ ptrdiff_t __xalloc_count; \ - __builtin_mul_overflow (n, s, &__xalloc_count); })) + : __extension__ \ + ({ ptrdiff_t __xalloc_count; \ + __builtin_mul_overflow (n, s, &__xalloc_count); })) /* Other compilers use integer division; this may be slower but is more portable. */ |