diff options
| author | Joakim Verona | 2013-07-14 11:04:49 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-14 11:04:49 +0200 |
| commit | 0bb9bb0841d89fff09820a57369df4cb01b16b43 (patch) | |
| tree | 832bf9fa8415eef0ce464d22b3ee1300cfa90bb1 /m4/stdalign.m4 | |
| parent | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (diff) | |
| parent | 3af1c8684ed6e48fbc21481d129e9aa164752c6e (diff) | |
| download | emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.tar.gz emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/xdisp.c
Diffstat (limited to 'm4/stdalign.m4')
| -rw-r--r-- | m4/stdalign.m4 | 3 |
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], | |||
| 31 | 31 | ||
| 32 | /* Test _Alignas only on platforms where gnulib can help. */ | 32 | /* Test _Alignas only on platforms where gnulib can help. */ |
| 33 | #if \ | 33 | #if \ |
| 34 | (__GNUC__ || __IBMC__ || __IBMCPP__ \ | 34 | ((defined __cplusplus && 201103 <= __cplusplus) \ |
| 35 | || __GNUC__ || __IBMC__ || __IBMCPP__ || __ICC \ | ||
| 35 | || 0x5110 <= __SUNPRO_C || 1300 <= _MSC_VER) | 36 | || 0x5110 <= __SUNPRO_C || 1300 <= _MSC_VER) |
| 36 | struct alignas_test { char c; char alignas (8) alignas_8; }; | 37 | struct alignas_test { char c; char alignas (8) alignas_8; }; |
| 37 | char test_alignas[offsetof (struct alignas_test, alignas_8) == 8 | 38 | char test_alignas[offsetof (struct alignas_test, alignas_8) == 8 |