diff options
| author | Paul Eggert | 2017-07-13 19:24:06 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-07-13 19:24:49 -0700 |
| commit | 3128d5d10e702ccb0732d947370e539a54046fc9 (patch) | |
| tree | a2a3c95dcf1263d55ca63fb4675b43286a8351de /lib/xalloc-oversized.h | |
| parent | ab87dbad1d26fba4e33b62b4b5a840be77ae9aa5 (diff) | |
| download | emacs-3128d5d10e702ccb0732d947370e539a54046fc9.tar.gz emacs-3128d5d10e702ccb0732d947370e539a54046fc9.zip | |
Merge from gnulib
This incorporates:
2017-07-13 Improve cross-compilation guesses for native Windows
2017-07-11 More systematic m4 quoting and indentation
2017-07-10 Make sure $host and $host_os are defined when used
2017-07-03 stdioext: Port to OpenVMS
2017-06-24 xalloc-oversized: port to icc
* doc/misc/texinfo.tex, lib/fpending.c, lib/stdio-impl.h:
* lib/xalloc-oversized.h, m4/dirfd.m4, m4/gettimeofday.m4:
* m4/lstat.m4, m4/mktime.m4, m4/pselect.m4, m4/putenv.m4:
* m4/stdint.m4, m4/strtoimax.m4, m4/utimes.m4:
Copy from Gnulib.
Diffstat (limited to 'lib/xalloc-oversized.h')
| -rw-r--r-- | lib/xalloc-oversized.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/xalloc-oversized.h b/lib/xalloc-oversized.h index ff0efc6ba40..2e09bab0be2 100644 --- a/lib/xalloc-oversized.h +++ b/lib/xalloc-oversized.h | |||
| @@ -44,7 +44,7 @@ typedef size_t __xalloc_count_type; | |||
| 44 | #if 7 <= __GNUC__ | 44 | #if 7 <= __GNUC__ |
| 45 | # define xalloc_oversized(n, s) \ | 45 | # define xalloc_oversized(n, s) \ |
| 46 | __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1) | 46 | __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1) |
| 47 | #elif 5 <= __GNUC__ && !__STRICT_ANSI__ | 47 | #elif 5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__ |
| 48 | # define xalloc_oversized(n, s) \ | 48 | # define xalloc_oversized(n, s) \ |
| 49 | (__builtin_constant_p (n) && __builtin_constant_p (s) \ | 49 | (__builtin_constant_p (n) && __builtin_constant_p (s) \ |
| 50 | ? __xalloc_oversized (n, s) \ | 50 | ? __xalloc_oversized (n, s) \ |