diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-12-22 18:42:50 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-12-22 18:44:04 -0800 |
| commit | e3040f2aee768655198dd6f979a1ff3a72d17d16 (patch) | |
| tree | 3e4f1fa270b9f1dfee6b4009e2097f5d0bdc4e16 /m4 | |
| parent | b11d8924b565bd96939537b10a70bb3c26532bed (diff) | |
Merge from gnulib
2014-12-20 utimens: remove unnecessary assert
2014-12-16 stdalign: port better to HP compilers
2014-12-16 stdalign: work around Apple GCC 4.0 bug
* lib/stdalign.in.h, lib/utimens.c, m4/stdalign.m4: Update from gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/stdalign.m4 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/m4/stdalign.m4 b/m4/stdalign.m4 index 9efafe5c5b..f60257f16a 100644 --- a/m4/stdalign.m4 +++ b/m4/stdalign.m4 @@ -32,8 +32,12 @@ AC_DEFUN([gl_STDALIGN_H], /* Test _Alignas only on platforms where gnulib can help. */ #if \ ((defined __cplusplus && 201103 <= __cplusplus) \ - || __GNUC__ || __IBMC__ || __IBMCPP__ || __ICC \ - || 0x5110 <= __SUNPRO_C || 1300 <= _MSC_VER) + || (defined __APPLE__ && defined __MACH__ \ + ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ + : __GNUC__) \ + || __HP_cc || __HP_aCC || __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 ? 1 : -1]; |