diff options
| author | Clint Adams <clint@debian.org> | 2018-07-04 13:05:31 -0400 |
|---|---|---|
| committer | Clint Adams <clint@debian.org> | 2018-07-04 13:05:31 -0400 |
| commit | 117dcd10d7e04d0dda7668518b8d085027f4d705 (patch) | |
| tree | f9612d6268ab16555fb21be04bc7594f9eb6ce4f /lib/xalloc-oversized.h | |
| parent | 1c0d840cad3dc7c951a86c9c128a721e9ebcd2cf (diff) | |
New upstream version 4.5
Diffstat (limited to 'lib/xalloc-oversized.h')
| -rw-r--r-- | lib/xalloc-oversized.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/xalloc-oversized.h b/lib/xalloc-oversized.h index ff0efc6..3426e10 100644 --- a/lib/xalloc-oversized.h +++ b/lib/xalloc-oversized.h @@ -1,6 +1,6 @@ /* xalloc-oversized.h -- memory allocation size checking - Copyright (C) 1990-2000, 2003-2004, 2006-2017 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2003-2004, 2006-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #ifndef XALLOC_OVERSIZED_H_ #define XALLOC_OVERSIZED_H_ @@ -44,7 +44,7 @@ typedef size_t __xalloc_count_type; #if 7 <= __GNUC__ # define xalloc_oversized(n, s) \ __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1) -#elif 5 <= __GNUC__ && !__STRICT_ANSI__ +#elif 5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__ # define xalloc_oversized(n, s) \ (__builtin_constant_p (n) && __builtin_constant_p (s) \ ? __xalloc_oversized (n, s) \ |