diff options
| author |  Jorge Canizales <jcanizales@google.com> | 2016-06-24 12:48:43 -0700 |
|---|---|---|
| committer | Jorge Canizales <jcanizales@google.com> | 2016-06-24 12:48:43 -0700 |
| commit | 8a556b7fe34355faf6573d8958cdb0730dd41956 (patch) | |
| tree | 06ca945c0cb9d31c640b13eda3fcb1de4b084aff /src/core/lib/iomgr/tcp_windows.h | |
| parent | fa70dacf95b93486b7dfe0c21ada90d75a5d5bcd (diff) | |
| parent | 0140f7c9e6c20fe78035d9635a3f5725d51ad35a (diff) | |
Merge master into let-invalidate-channels
Had to manually resolve import conflicts in InteropTests.m
To be fair, the merge algorithm should have been able to do it.
Diffstat (limited to 'src/core/lib/iomgr/tcp_windows.h')
| -rw-r--r-- | src/core/lib/iomgr/tcp_windows.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/tcp_windows.h b/src/core/lib/iomgr/tcp_windows.h index a2f58eddd5..86d777235e 100644 --- a/src/core/lib/iomgr/tcp_windows.h +++ b/src/core/lib/iomgr/tcp_windows.h @@ -52,6 +52,6 @@ */ grpc_endpoint *grpc_tcp_create(grpc_winsocket *socket, char *peer_string); -int grpc_tcp_prepare_socket(SOCKET sock); +grpc_error *grpc_tcp_prepare_socket(SOCKET sock); #endif /* GRPC_CORE_LIB_IOMGR_TCP_WINDOWS_H */ |