diff options
| author | David Benjamin <davidben@google.com> | 2016-06-09 23:48:33 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2016-06-10 00:29:36 +0300 |
| commit | a353cdb67191a6eacd3409cc642816574084b871 (patch) | |
| tree | 2f8c27a7e50a00dde795aa6621a001265e99a8d1 /crypto/mem.c | |
| parent | 2e8ba2d25d18d37ac36f5aea07b546c7221d4d1c (diff) | |
Wrap MSVC-only warning pragmas in a macro.
There's a __pragma expression which allows this. Android builds us Windows with
MinGW for some reason, so we actually do have to tolerate non-MSVC-compatible
Windows compilers. (Clang for Windows is much more sensible than MinGW and
intentionally mimicks MSVC.)
MinGW doesn't understand MSVC's pragmas and warns a lot. #pragma warning is
safe to suppress, so wrap those to shush them. This also lets us do away with a
few ifdefs.
Change-Id: I1f5a8bec4940d4b2d947c4c1cc9341bc15ec4972
Reviewed-on: https://boringssl-review.googlesource.com/8236
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto/mem.c')
| -rw-r--r-- | crypto/mem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/mem.c b/crypto/mem.c index c83eb5a2..ca4c5593 100644 --- a/crypto/mem.c +++ b/crypto/mem.c @@ -66,9 +66,9 @@ #include <string.h> #if defined(OPENSSL_WINDOWS) -#pragma warning(push, 3) +OPENSSL_MSVC_PRAGMA(warning(push, 3)) #include <windows.h> -#pragma warning(pop) +OPENSSL_MSVC_PRAGMA(warning(pop)) #else #include <strings.h> #endif |