yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge BoringSSL 2e74fda: Don't redefine alignas in C++.

Browse Source
This commit is contained in:
Brian Smith 2018-11-13 16:23:23 -10:00
commit fd118ce114
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/internal.h
View File

@ -126,6 +126,7 @@
#pragma warning(pop) #pragma warning(pop)
#endif #endif
#if !defined(__cplusplus)
#if defined(__GNUC__) && \ #if defined(__GNUC__) && \
(__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800 (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800
// |alignas| and |alignof| were added in C11. GCC added support in version 4.8. // |alignas| and |alignof| were added in C11. GCC added support in version 4.8.
@ -133,8 +134,7 @@
// reports support for C11. // reports support for C11.
#define alignas(x) __attribute__ ((aligned (x))) #define alignas(x) __attribute__ ((aligned (x)))
#define alignof(x) __alignof__ (x) #define alignof(x) __alignof__ (x)
#elif !defined(__cplusplus) #elif defined(_MSC_VER)
#if defined(_MSC_VER)
#define alignas(x) __declspec(align(x)) #define alignas(x) __declspec(align(x))
#define alignof(x) __alignof(x) #define alignof(x) __alignof(x)
#else #else