diff options
| author | David Allsopp <david.allsopp@metastack.com> | 2020-07-03 13:44:51 +0100 |
|---|---|---|
| committer | David Allsopp <david.allsopp@metastack.com> | 2020-07-03 13:44:51 +0100 |
| commit | f2d15005de2a3778cc9ceb9eb371251a0d339717 (patch) | |
| tree | b51b93b860946a281189843aa15e8d69c94a0da1 /runtime | |
| parent | c441a1856633cff8c79f1cd4392c223051e304c1 (diff) | |
| download | ocaml-f2d15005de2a3778cc9ceb9eb371251a0d339717.tar.gz | |
Merge pull request #9724 from MisterDA/fix-domain-state
Fix #9714 "Compilation failure in domain_state.h"
(cherry picked from commit bdb471287fee34564ba0e7e9b55eaecf7cfc48d4)
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/caml/misc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/caml/misc.h b/runtime/caml/misc.h index 7fea2b1443..8eb09931ab 100644 --- a/runtime/caml/misc.h +++ b/runtime/caml/misc.h @@ -101,6 +101,8 @@ CAMLdeprecated_typedef(addr, char *); /* we need to be able to compute the exact offset of each member. */ #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L #define CAMLalign(n) _Alignas(n) +#elif defined(__cplusplus) && _MSC_VER >= 1900 +#define CAMLalign(n) alignas(n) #elif defined(SUPPORTS_ALIGNED_ATTRIBUTE) #define CAMLalign(n) __attribute__((aligned(n))) #elif _MSC_VER >= 1500 |