diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-05-25 00:13:14 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-05-25 00:13:33 -0700 |
| commit | 9ebc2bbe3c1efea79810261533791bdf48a63760 (patch) | |
| tree | 7173c08cfaa7ff8e69ef6258835a7c12a19aefbe /lib | |
| parent | b2ec91db89739153b39d10c15701b57aae7e251c (diff) | |
| download | emacs-9ebc2bbe3c1efea79810261533791bdf48a63760.tar.gz | |
Merge from gnulib
This incorporates:
2017-05-25 port to recent icc
* lib/intprops.h: Copy from gnulib.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/intprops.h | 6 |
1 files changed, 5 insertions, 1 deletions
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__) |