From 054e597670b158012a585f0f3d3bbf106211a7e9 Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Thu, 16 Jun 2016 12:08:26 -0400 Subject: [PATCH] Include intrin.h under cover of warning pragmas. 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 --- crypto/mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/mem.c b/crypto/mem.c index f44e90fb..527edd93 100644 --- a/crypto/mem.c +++ b/crypto/mem.c @@ -68,7 +68,6 @@ #if defined(OPENSSL_WINDOWS) OPENSSL_MSVC_PRAGMA(warning(push, 3)) #include -OPENSSL_MSVC_PRAGMA(warning(pop)) /* Work around a clang-cl bug: SecureZeroMemory() below uses __stosb() but * 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. */ #include +OPENSSL_MSVC_PRAGMA(warning(pop)) #else #include #endif