diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-04-11 09:07:15 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-04-11 09:07:15 -0700 |
| commit | ff2c76476479c43607825df01c78d8f239caefb5 (patch) | |
| tree | 9eb72adddeab4fb7b0cebf49df81ab31f3bf8a13 /lib | |
| parent | d6ea6453f3d1696b9e6cd0a0222fc77dc646365c (diff) | |
| parent | 80128a784912096c6b0ee46b76b068e019cff057 (diff) | |
Merge from origin/emacs-25
80128a7 Fix stability confusion in sort-tests
1e4aa42 Avoid describe-key error with lambdas
a05fb21 * lisp/emacs-lisp/package.el (package-install-selected-packag...
f501116 Sync with gnulib
c4963f9 Fix doc for Universal Time
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stddef.in.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/stddef.in.h b/lib/stddef.in.h index c6d2317ca2..f4c4a1070d 100644 --- a/lib/stddef.in.h +++ b/lib/stddef.in.h @@ -81,8 +81,10 @@ # define wchar_t int #endif -/* Some platforms lack max_align_t. */ -#if !@HAVE_MAX_ALIGN_T@ +/* Some platforms lack max_align_t. The check for _GCC_MAX_ALIGN_T is + a hack in case the configure-time test was done with g++ even though + we are currently compiling with gcc. */ +#if ! (@HAVE_MAX_ALIGN_T@ || defined _GCC_MAX_ALIGN_T) /* On the x86, the maximum storage alignment of double, long, etc. is 4, but GCC's C11 ABI for x86 says that max_align_t has an alignment of 8, and the C11 standard allows this. Work around this problem by |