From 9ebc2bbe3c1efea79810261533791bdf48a63760 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 25 May 2017 00:13:14 -0700 Subject: [PATCH] Merge from gnulib This incorporates: 2017-05-25 port to recent icc * lib/intprops.h: Copy from gnulib. --- lib/intprops.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/intprops.h b/lib/intprops.h index 8f5ad545154..28f43613fe2 100644 --- a/lib/intprops.h +++ b/lib/intprops.h @@ -219,7 +219,11 @@ : (max) >> (b) < (a)) /* True if __builtin_add_overflow (A, B, P) works when P is non-null. */ -#define _GL_HAS_BUILTIN_OVERFLOW (5 <= __GNUC__) +#if 5 <= __GNUC__ && !defined __ICC +# define _GL_HAS_BUILTIN_OVERFLOW 1 +#else +# define _GL_HAS_BUILTIN_OVERFLOW 0 +#endif /* True if __builtin_add_overflow_p (A, B, C) works. */ #define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__) -- 2.39.2