diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-05-11 09:13:27 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-05-11 09:13:27 -0700 |
| commit | 5b9e7430d9e056b393ea6aec199260d763840ba5 (patch) | |
| tree | eec1d00f3f8c41435d7732d6694f8eca4d7b30ec /src/core | |
| parent | f7670f3054e4ed05715120728e345e4bb0a13d3d (diff) | |
| parent | ad21fea239769e2a3be14ac56ee747eb0f3c13a3 (diff) | |
Merge github.com:grpc/grpc into bye-bye-completion-queue-pie
Conflicts:
vsprojects/Grpc.mak
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/iomgr/iocp_windows.c | 1 | ||||
| -rw-r--r-- | src/core/iomgr/tcp_client_windows.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/core/iomgr/iocp_windows.c b/src/core/iomgr/iocp_windows.c index 8827bb99bc..0c62bfccd5 100644 --- a/src/core/iomgr/iocp_windows.c +++ b/src/core/iomgr/iocp_windows.c @@ -121,7 +121,6 @@ static void do_iocp_work() { } static void iocp_loop(void *p) { - void * eventshutdown = NULL; while (gpr_atm_acq_load(&g_orphans) || gpr_atm_acq_load(&g_custom_events) || !gpr_event_get(&g_shutdown_iocp)) { diff --git a/src/core/iomgr/tcp_client_windows.c b/src/core/iomgr/tcp_client_windows.c index d95346f87a..cf5174327d 100644 --- a/src/core/iomgr/tcp_client_windows.c +++ b/src/core/iomgr/tcp_client_windows.c @@ -98,10 +98,10 @@ static void on_connect(void *acp, int from_iocp) { if (from_iocp) { DWORD transfered_bytes = 0; DWORD flags; - info->outstanding = 0; BOOL wsa_success = WSAGetOverlappedResult(sock, &info->overlapped, &transfered_bytes, FALSE, &flags); + info->outstanding = 0; GPR_ASSERT(transfered_bytes == 0); if (!wsa_success) { char *utf8_message = gpr_format_message(WSAGetLastError()); |