From 5a3122e1679575a8b4e24d3d965f6d6684ae118e Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 9 Sep 2015 12:36:18 -0700 Subject: Merge from gnulib and texinfo This incorporates: 2015-08-03 Improve port of stdalign to C++11 * lib/stdalign.in.h: Copy from gnulib. * doc/misc/texinfo.tex: Copy from texinfo. --- lib/stdalign.in.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'lib/stdalign.in.h') diff --git a/lib/stdalign.in.h b/lib/stdalign.in.h index a990050b67d..c6115b6dbe0 100644 --- a/lib/stdalign.in.h +++ b/lib/stdalign.in.h @@ -64,7 +64,9 @@ # define _Alignof(type) offsetof (struct { char __a; type __b; }, __b) # endif #endif -#define alignof _Alignof +#if ! (defined __cplusplus && 201103 <= __cplusplus) +# define alignof _Alignof +#endif #define __alignof_is_defined 1 /* alignas (A), also known as _Alignas (A), aligns a variable or type @@ -105,8 +107,11 @@ # define _Alignas(a) __declspec (align (a)) # endif #endif -#if defined _Alignas || (defined __STDC_VERSION && 201112 <= __STDC_VERSION__) +#if ((defined _Alignas && ! (defined __cplusplus && 201103 <= __cplusplus)) \ + || (defined __STDC_VERSION && 201112 <= __STDC_VERSION__)) # define alignas _Alignas +#endif +#if defined alignas || (defined __cplusplus && 201103 <= __cplusplus) # define __alignas_is_defined 1 #endif -- cgit v1.2.1