diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-04-27 15:43:57 -0700 |
|---|---|---|
| committer | Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-04-27 15:43:57 -0700 |
| commit | 64a6eed59e1e784595c7cb85d1011740788aa8fb (patch) | |
| tree | 9063bc102bbe057d231dd76a4df1b1691689cb66 /src/core | |
| parent | cac5f1d53248a81594779186765c746bc9b89a41 (diff) | |
| parent | 0d20f42c933902aadf4f56ebd8747ff5d70327c1 (diff) | |
Merge pull request #1371 from wkubiak/master
Fix errors and warnings breaking compilation under GCC+Windows (MSYS2/MinGW)
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/iomgr/resolve_address_windows.c | 4 | ||||
| -rw-r--r-- | src/core/iomgr/tcp_server_windows.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/core/iomgr/resolve_address_windows.c b/src/core/iomgr/resolve_address_windows.c index ac31dadd9d..9b416dfe8a 100644 --- a/src/core/iomgr/resolve_address_windows.c +++ b/src/core/iomgr/resolve_address_windows.c @@ -65,7 +65,6 @@ grpc_resolved_addresses *grpc_blocking_resolve_address( int s; size_t i; grpc_resolved_addresses *addrs = NULL; - const gpr_timespec start_time = gpr_now(); /* parse name, splitting it into host and port parts */ gpr_split_host_port(name, &host, &port); @@ -108,9 +107,6 @@ grpc_resolved_addresses *grpc_blocking_resolve_address( } { - const gpr_timespec delay = gpr_time_sub(gpr_now(), start_time); - const int delay_ms = - delay.tv_sec * GPR_MS_PER_SEC + delay.tv_nsec / GPR_NS_PER_MS; for (i = 0; i < addrs->naddrs; i++) { char *buf; grpc_sockaddr_to_string(&buf, (struct sockaddr *)&addrs->addrs[i].addr, diff --git a/src/core/iomgr/tcp_server_windows.c b/src/core/iomgr/tcp_server_windows.c index 6e10da97cc..fe92846a71 100644 --- a/src/core/iomgr/tcp_server_windows.c +++ b/src/core/iomgr/tcp_server_windows.c @@ -192,7 +192,7 @@ static void start_accept(server_port *port) { } /* TODO(jtattermusch): probably a race here, we regularly get use-after-free on server shutdown */ - GPR_ASSERT(port->socket != 0xfeeefeee); + GPR_ASSERT(port->socket != (grpc_winsocket*)0xfeeefeee); success = port->AcceptEx(port->socket->socket, sock, port->addresses, 0, addrlen, addrlen, &bytes_received, &port->socket->read_info.overlapped); |