| commit | 6e899c7d3f4c7bd6383a0ca171a50e95aa9d8e2d | [log] [tgz] |
|---|---|---|
| author | David Benjamin <davidben@google.com> | Thu Jun 09 18:02:18 2016 -0400 |
| committer | David Benjamin <davidben@google.com> | Fri Jun 10 16:29:17 2016 -0400 |
| tree | 585961b54b0d6c2fad8b73d441b1c30f1bc38fcf | |
| parent | d316cba52b5aeac660e03068e65dd873669ce1db [diff] [blame] |
external/boringssl: Sync to 171b54. This includes the following changes: https://boringssl.googlesource.com/boringssl/+log/8ca0b4127da11d766067ea6ec4122017ba0edb0e..171b5403ee767fa0f3aecd377867db6533c3eb8f This also updates the build file to build as C99, so BoringSSL can use variables in for loops. Change-Id: I48ae985fd1bed244f7ed327aefc9a13e5b17b185
diff --git a/src/crypto/cpu-intel.c b/src/crypto/cpu-intel.c index 431e1e1..f2e0c4c 100644 --- a/src/crypto/cpu-intel.c +++ b/src/crypto/cpu-intel.c
@@ -69,10 +69,10 @@ #include <string.h> #if defined(OPENSSL_WINDOWS) -#pragma warning(push, 3) +OPENSSL_MSVC_PRAGMA(warning(push, 3)) #include <immintrin.h> #include <intrin.h> -#pragma warning(pop) +OPENSSL_MSVC_PRAGMA(warning(pop)) #endif #include "internal.h"