Build with clang-cl standalone.
Our build logic needed to revised and and clang implements more warnings
than MSVC, so GTest needed more fixes.
Bug: 200
Change-Id: I84c5dd0c51079dd9c990e08dbea7f9022a7d6842
Reviewed-on: https://boringssl-review.googlesource.com/21204
Commit-Queue: Steven Valdez <svaldez@google.com>
Reviewed-by: Steven Valdez <svaldez@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
diff --git a/tool/client.cc b/tool/client.cc
index d439860..2ec381f 100644
--- a/tool/client.cc
+++ b/tool/client.cc
@@ -196,7 +196,15 @@
}
while (!resume_session) {
+#if defined(OPENSSL_WINDOWS)
+ // Windows sockets are really of type SOCKET, not int, but everything here
+ // casts them to ints. Clang gets unhappy about signed values as a result.
+ //
+ // TODO(davidben): Keep everything as the appropriate platform type.
+ FD_SET(static_cast<SOCKET>(sock), &read_fds);
+#else
FD_SET(sock, &read_fds);
+#endif
int ret = select(sock + 1, &read_fds, NULL, NULL, NULL);
if (ret <= 0) {
perror("select");
diff --git a/tool/transport_common.cc b/tool/transport_common.cc
index 73f9e2d..a7c2b36 100644
--- a/tool/transport_common.cc
+++ b/tool/transport_common.cc
@@ -170,7 +170,14 @@
OPENSSL_memset(&addr, 0, sizeof(addr));
addr.sin6_family = AF_INET6;
+ // Windows' IN6ADDR_ANY_INIT does not have enough curly braces for clang-cl
+ // (https://crbug.com/772108), while other platforms like NaCl are missing
+ // in6addr_any, so use a mix of both.
+#if defined(OPENSSL_WINDOWS)
+ addr.sin6_addr = in6addr_any;
+#else
addr.sin6_addr = IN6ADDR_ANY_INIT;
+#endif
addr.sin6_port = htons(atoi(port.c_str()));
#if defined(OPENSSL_WINDOWS)
