summaryrefslogtreecommitdiff
path: root/lib/stddef.in.h
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-04-03 23:12:04 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-04-03 23:12:29 -0700
commitf501116ea896b20f195f5c841e8770d7fe0418b9 (patch)
treeacba39c6874e999c1b914838bf0bd2b60ec13e25 /lib/stddef.in.h
parentc4963f9a905bf15740aa7e3ebf85af917f17be15 (diff)
downloademacs-f501116ea896b20f195f5c841e8770d7fe0418b9.tar.gz
Sync with gnulib
This incorporates: 2016-04-03 stdint: detect good enough pre-C++11 stdint.h in C++ mode 2016-04-01 stddef: support configuring with g++ * doc/misc/texinfo.tex, lib/stddef.in.h, m4/stdint.m4: Copy from gnulib.
Diffstat (limited to 'lib/stddef.in.h')
-rw-r--r--lib/stddef.in.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/stddef.in.h b/lib/stddef.in.h
index c6d2317ca2d..f4c4a1070d5 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