kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tidy up alignof #defines.

Browse Source 
We haven't supported MSVC 2013 for a while (we may even be able to drop
2015 in not too long). There is also no need to pull in stdalign.h in
C++. alignof and alignas are keywords.

Change-Id: Ib31d8166282592bcb9e1c543e57758ff55746404
Reviewed-on: https://boringssl-review.googlesource.com/20704
Commit-Queue: Steven Valdez <svaldez@google.com>
Reviewed-by: Steven Valdez <svaldez@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
David Benjamin 2017-09-22 17:03:29 -04:00 committed by CQ bot account: commit-bot@chromium.org
parent e58f8a6b9a
commit 3a18bf0474
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

@ -116,14 +116,14 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#if !defined(__cplusplus)
#if defined(_MSC_VER) #if defined(_MSC_VER)
#if !defined(__cplusplus) || _MSC_VER < 1900
#define alignas(x) __declspec(align(x)) #define alignas(x) __declspec(align(x))
#define alignof __alignof #define alignof __alignof
#endif
#else #else
#include <stdalign.h> #include <stdalign.h>
#endif #endif
#endif
#if !defined(OPENSSL_NO_THREADS) && \ #if !defined(OPENSSL_NO_THREADS) && \
(!defined(OPENSSL_WINDOWS) || defined(__MINGW32__)) (!defined(OPENSSL_WINDOWS) || defined(__MINGW32__))