summaryrefslogtreecommitdiff
path: root/m4/stdalign.m4
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2013-07-07 23:15:38 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2013-07-07 23:15:38 -0700
commit2a74a90a033ec2bf2580ca1c7163209f1cd3faed (patch)
tree888b313d913d9ac5da8161784a39c85b4ca5241e /m4/stdalign.m4
parent6602769357bba5616c4d36a12d2dce254f4b5fee (diff)
downloademacs-2a74a90a033ec2bf2580ca1c7163209f1cd3faed.tar.gz
Try to fix FreeBSD 9.1 porting problem.
This incorporates the following merge from gnulib: 2013-07-07 stdalign, verify: port to FreeBSD 9.1, to C11, and to C++11 Fixes: debbugs:14812
Diffstat (limited to 'm4/stdalign.m4')
-rw-r--r--m4/stdalign.m43
1 files changed, 2 insertions, 1 deletions
diff --git a/m4/stdalign.m4 b/m4/stdalign.m4
index a866ff670b1..20be01aaf20 100644
--- a/m4/stdalign.m4
+++ b/m4/stdalign.m4
@@ -31,7 +31,8 @@ AC_DEFUN([gl_STDALIGN_H],
/* Test _Alignas only on platforms where gnulib can help. */
#if \
- (__GNUC__ || __IBMC__ || __IBMCPP__ \
+ ((defined __cplusplus && 201103 <= __cplusplus) \
+ || __GNUC__ || __IBMC__ || __IBMCPP__ || __ICC \
|| 0x5110 <= __SUNPRO_C || 1300 <= _MSC_VER)
struct alignas_test { char c; char alignas (8) alignas_8; };
char test_alignas[offsetof (struct alignas_test, alignas_8) == 8