diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2024-01-20 11:45:04 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2024-01-20 11:45:38 -0800 |
| commit | 3add626f1405739aa430adcc0b4c27e587a7c561 (patch) | |
| tree | 1b30227dc3f70924a4ed92f662cec9276dea96c9 /lib/xalloc-oversized.h | |
| parent | d276996c4f60395464ca8d5d7de487022b4937fa (diff) | |
| download | emacs-3add626f1405739aa430adcc0b4c27e587a7c561.tar.gz | |
Update from Gnulib by running admin/merge-gnulib
Diffstat (limited to 'lib/xalloc-oversized.h')
| -rw-r--r-- | lib/xalloc-oversized.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/xalloc-oversized.h b/lib/xalloc-oversized.h index 2be82cd275d..0b7bb2cee85 100644 --- a/lib/xalloc-oversized.h +++ b/lib/xalloc-oversized.h @@ -1,7 +1,6 @@ /* xalloc-oversized.h -- memory allocation size checking - Copyright (C) 1990-2000, 2003-2004, 2006-2024 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 @@ -49,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. */ |