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

Include intrin.h under cover of warning pragmas.

Browse Source 
intrin.h on MSVC seems to have the same problem as other MSVC headers.
https://build.chromium.org/p/client.boringssl/builders/win64_small/builds/455/steps/ninja/logs/stdio

Change-Id: I98e959132c2f6188727d6c432f9c85aa0a78e91e
Reviewed-on: https://boringssl-review.googlesource.com/8305
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2016-06-16 12:08:26 -04:00 committed by Adam Langley
parent 2b360714ab
commit 054e597670
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/mem.c
View File

@ -68,7 +68,6 @@
#if defined(OPENSSL_WINDOWS) #if defined(OPENSSL_WINDOWS)
OPENSSL_MSVC_PRAGMA(warning(push, 3)) OPENSSL_MSVC_PRAGMA(warning(push, 3))
#include <windows.h> #include <windows.h>
OPENSSL_MSVC_PRAGMA(warning(pop))
/* Work around a clang-cl bug: SecureZeroMemory() below uses __stosb() but /* Work around a clang-cl bug: SecureZeroMemory() below uses __stosb() but
* windows.h only declares that intrinsic and then uses `#pragma intrinsic` for * windows.h only declares that intrinsic and then uses `#pragma intrinsic` for
@ -77,6 +76,7 @@ OPENSSL_MSVC_PRAGMA(warning(pop))
* TODO(thakis): Remove this once http://llvm.org/PR19898 is fixed. * TODO(thakis): Remove this once http://llvm.org/PR19898 is fixed.
*/ */
#include <intrin.h> #include <intrin.h>
OPENSSL_MSVC_PRAGMA(warning(pop))
#else #else
#include <strings.h> #include <strings.h>
#endif #endif