diff options
| author | David Benjamin <davidben@google.com> | 2016-06-16 19:08:26 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2016-06-16 19:12:32 +0300 |
| commit | 054e597670b158012a585f0f3d3bbf106211a7e9 (patch) | |
| tree | 1d7c770922076fff28162a880b1c42caef10e725 /crypto/mem.c | |
| parent | 2b360714abf9395d85ac9b50850fcd2fc4bda442 (diff) | |
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 <agl@google.com>
Diffstat (limited to 'crypto/mem.c')
| -rw-r--r-- | crypto/mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 <windows.h> -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 <intrin.h> +OPENSSL_MSVC_PRAGMA(warning(pop)) #else #include <strings.h> #endif |