From f2d15005de2a3778cc9ceb9eb371251a0d339717 Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Fri, 3 Jul 2020 13:44:51 +0100 Subject: Merge pull request #9724 from MisterDA/fix-domain-state Fix #9714 "Compilation failure in domain_state.h" (cherry picked from commit bdb471287fee34564ba0e7e9b55eaecf7cfc48d4) --- runtime/caml/misc.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'runtime') 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 -- cgit v1.2.1