diff options
-rw-r--r-- | support/ChangeLog | 4 | ||||
-rw-r--r-- | support/intprops.h | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/support/ChangeLog b/support/ChangeLog index e2077bd0..54756048 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -1,3 +1,7 @@ +2017-06-18 Arnold D. Robbins <arnold@skeeve.com> + + * intprops.h: Sync with GNULIB. + 2017-05-22 Arnold D. Robbins <arnold@skeeve.com> * dfa.c, dfa.h, intprops.h, verify.h: Sync with GNULIB. diff --git a/support/intprops.h b/support/intprops.h index d8c71206..33a7ec5a 100644 --- a/support/intprops.h +++ b/support/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__) |