aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Benjamin <davidben@google.com>2017-01-10 15:20:19 -0500
committerCQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>2017-01-10 20:30:48 +0000
commit7c7ab217815c01bab0e961ea5bf7cf0ebb63f19c (patch)
tree48c900534c47b689f8dbf0ec1d2b98f39c8fd926
parent9c33ae85621ef8e00a42309b5101e0bedd02b816 (diff)
downloadboringssl-7c7ab217815c01bab0e961ea5bf7cf0ebb63f19c.zip
boringssl-7c7ab217815c01bab0e961ea5bf7cf0ebb63f19c.tar.gz
boringssl-7c7ab217815c01bab0e961ea5bf7cf0ebb63f19c.tar.bz2
Guard a winsock2.h include under the usual pragmas.
We missed this one. Microsoft doesn't usually pass their own level 4 warnings. Kenny Root reports this otherwise trips warnings on some version of the Windows SDK. Change-Id: I71dc837ff8ee52321483d26c3a2cd8676393d999 Reviewed-on: https://boringssl-review.googlesource.com/13110 Reviewed-by: Kenny Root <kroot@google.com> Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
-rw-r--r--tool/client.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/tool/client.cc b/tool/client.cc
index dd3f846..c832ab5 100644
--- a/tool/client.cc
+++ b/tool/client.cc
@@ -19,7 +19,9 @@
#if !defined(OPENSSL_WINDOWS)
#include <sys/select.h>
#else
+OPENSSL_MSVC_PRAGMA(warning(push, 3))
#include <winsock2.h>
+OPENSSL_MSVC_PRAGMA(warning(pop))
#endif
#include <openssl/err.h>