Commit 5a3122e1 authored by Paul Eggert's avatar Paul Eggert

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.
parent ab21f61a
This diff is collapsed.
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment