diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2022-10-24 22:25:44 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2022-10-24 22:25:44 +0200 |
| commit | cb4186bef1b44691db4221406d001a8d40c65b4b (patch) | |
| tree | 285662381eaa0514f988142bff0c8a9685c84dc0 /tests/stdalign.in.h | |
| parent | cc0876a2fa9e703b1064992ab535f3eed57e9c71 (diff) | |
| parent | 26112352a774737e1ce5580c93654a26c1e82b39 (diff) | |
Update upstream source from tag 'upstream/1.1'
Update to upstream version '1.1'
with Debian dir acc8a9214de592a0bbbdb680385559210b329d52
Diffstat (limited to 'tests/stdalign.in.h')
| -rw-r--r-- | tests/stdalign.in.h | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/tests/stdalign.in.h b/tests/stdalign.in.h index 3b117df1..58fd245c 100644 --- a/tests/stdalign.in.h +++ b/tests/stdalign.in.h @@ -42,10 +42,7 @@ '-malign-double' is used. The result cannot be used as a value for an 'enum' constant, if you - want to be portable to HP-UX 10.20 cc and AIX 3.2.5 xlc. - - Include <stddef.h> for offsetof. */ -#include <stddef.h> + want to be portable to HP-UX 10.20 cc and AIX 3.2.5 xlc. */ /* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other standard headers, defines conflicting implementations of _Alignas @@ -61,17 +58,19 @@ && !defined __clang__) \ || (defined __clang__ && __clang_major__ < 8)) # ifdef __cplusplus -# if 201103 <= __cplusplus +# if (201103 <= __cplusplus || defined _MSC_VER) # define _Alignof(type) alignof (type) # else template <class __t> struct __alignof_helper { char __a; __t __b; }; # define _Alignof(type) offsetof (__alignof_helper<type>, __b) +# define _GL_STDALIGN_NEEDS_STDDEF 1 # endif # else # define _Alignof(type) offsetof (struct { char __a; type __b; }, __b) +# define _GL_STDALIGN_NEEDS_STDDEF 1 # endif #endif -#if ! (defined __cplusplus && 201103 <= __cplusplus) +#if ! (defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER)) # define alignof _Alignof #endif #define __alignof_is_defined 1 @@ -102,7 +101,7 @@ */ #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 -# if defined __cplusplus && 201103 <= __cplusplus +# if defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER) # define _Alignas(a) alignas (a) # elif (!defined __attribute__ \ && ((defined __APPLE__ && defined __MACH__ \ @@ -116,12 +115,19 @@ # define _Alignas(a) __declspec (align (a)) # endif #endif -#if ((defined _Alignas && ! (defined __cplusplus && 201103 <= __cplusplus)) \ +#if ((defined _Alignas \ + && !(defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER))) \ || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) # define alignas _Alignas #endif -#if defined alignas || (defined __cplusplus && 201103 <= __cplusplus) +#if (defined alignas \ + || (defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER))) # define __alignas_is_defined 1 #endif +/* Include <stddef.h> if needed for offsetof. */ +#if _GL_STDALIGN_NEEDS_STDDEF +# include <stddef.h> +#endif + #endif /* _GL_STDALIGN_H */ |