diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2018-03-08 18:23:18 -0800 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2018-03-08 18:23:18 -0800 |
| commit | 68dbea2e6ad11e47be24fca0e666e407e8ceaa1f (patch) | |
| tree | 0bc0da3c1e2620bcef80effd7944d1f3043aa08c | |
| parent | 268936a8ac755a751140d3ed137dbf8ded0c56a6 (diff) | |
Trial windows changes
| -rw-r--r-- | src/core/ext/filters/client_channel/lb_policy_factory.cc | 2 | ||||
| -rw-r--r-- | src/core/lib/iomgr/resolve_address.h | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/core/ext/filters/client_channel/lb_policy_factory.cc b/src/core/ext/filters/client_channel/lb_policy_factory.cc index f2a800b221..4c367ce3c5 100644 --- a/src/core/ext/filters/client_channel/lb_policy_factory.cc +++ b/src/core/ext/filters/client_channel/lb_policy_factory.cc @@ -64,7 +64,7 @@ void grpc_lb_addresses_set_address(grpc_lb_addresses* addresses, size_t index, if (user_data != nullptr) GPR_ASSERT(addresses->user_data_vtable != nullptr); grpc_lb_address* target = &addresses->addresses[index]; memcpy(target->address.addr, address, address_len); - target->address.len = address_len; + target->address.len = static_cast<socklen_t>(address_len); target->is_balancer = is_balancer; target->balancer_name = gpr_strdup(balancer_name); target->user_data = user_data; diff --git a/src/core/lib/iomgr/resolve_address.h b/src/core/lib/iomgr/resolve_address.h index 623554cdad..660819c595 100644 --- a/src/core/lib/iomgr/resolve_address.h +++ b/src/core/lib/iomgr/resolve_address.h @@ -19,9 +19,16 @@ #ifndef GRPC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_H #define GRPC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_H +#include <grpc/support/port_platform.h> + #include <stddef.h> + +#ifdef GPR_WINDOWS +#include <winsock2.h> +#else #include <sys/socket.h> -#include "src/core/lib/iomgr/exec_ctx.h" +#endif + #include "src/core/lib/iomgr/pollset_set.h" #define GRPC_MAX_SOCKADDR_SIZE 128 |