diff options
| author | Paul Eggert | 2014-12-22 18:42:50 -0800 |
|---|---|---|
| committer | Paul Eggert | 2014-12-22 18:44:04 -0800 |
| commit | e3040f2aee768655198dd6f979a1ff3a72d17d16 (patch) | |
| tree | 3e4f1fa270b9f1dfee6b4009e2097f5d0bdc4e16 /lib/stdalign.in.h | |
| parent | b11d8924b565bd96939537b10a70bb3c26532bed (diff) | |
| download | emacs-e3040f2aee768655198dd6f979a1ff3a72d17d16.tar.gz emacs-e3040f2aee768655198dd6f979a1ff3a72d17d16.zip | |
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 'lib/stdalign.in.h')
| -rw-r--r-- | lib/stdalign.in.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/stdalign.in.h b/lib/stdalign.in.h index dcaab55b577..413936df78c 100644 --- a/lib/stdalign.in.h +++ b/lib/stdalign.in.h | |||
| @@ -95,7 +95,10 @@ | |||
| 95 | #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 | 95 | #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 |
| 96 | # if defined __cplusplus && 201103 <= __cplusplus | 96 | # if defined __cplusplus && 201103 <= __cplusplus |
| 97 | # define _Alignas(a) alignas (a) | 97 | # define _Alignas(a) alignas (a) |
| 98 | # elif (__GNUC__ || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__ \ | 98 | # elif ((defined __APPLE__ && defined __MACH__ \ |
| 99 | ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ | ||
| 100 | : __GNUC__) \ | ||
| 101 | || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__ \ | ||
| 99 | || __ICC || 0x5110 <= __SUNPRO_C) | 102 | || __ICC || 0x5110 <= __SUNPRO_C) |
| 100 | # define _Alignas(a) __attribute__ ((__aligned__ (a))) | 103 | # define _Alignas(a) __attribute__ ((__aligned__ (a))) |
| 101 | # elif 1300 <= _MSC_VER | 104 | # elif 1300 <= _MSC_VER |