diff options
| author | David Benjamin <davidben@google.com> | 2016-06-09 18:02:18 -0400 |
|---|---|---|
| committer | David Benjamin <davidben@google.com> | 2016-06-10 16:29:17 -0400 |
| commit | 6e899c7d3f4c7bd6383a0ca171a50e95aa9d8e2d (patch) | |
| tree | 585961b54b0d6c2fad8b73d441b1c30f1bc38fcf /src/decrepit | |
| parent | d316cba52b5aeac660e03068e65dd873669ce1db (diff) | |
| download | boringssl-6e899c7d3f4c7bd6383a0ca171a50e95aa9d8e2d.tar.gz | |
external/boringssl: Sync to 171b54.android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
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
Diffstat (limited to 'src/decrepit')
| -rw-r--r-- | src/decrepit/cast/cast.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/decrepit/cast/cast.c b/src/decrepit/cast/cast.c index 94b07106..75ea6567 100644 --- a/src/decrepit/cast/cast.c +++ b/src/decrepit/cast/cast.c @@ -57,9 +57,9 @@ #include <openssl/cast.h> #if defined(OPENSSL_WINDOWS) -#pragma warning(push, 3) +OPENSSL_MSVC_PRAGMA(warning(push, 3)) #include <intrin.h> -#pragma warning(pop) +OPENSSL_MSVC_PRAGMA(warning(pop)) #endif #include "internal.h" |