diff options
author | Craig Tiller <ctiller@google.com> | 2016-11-04 16:01:23 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2016-11-04 16:01:23 -0700 |
commit | 194b23856aa7251ad99df62134ab0301c5a37a5d (patch) | |
tree | a6c2c05cecae62171fccffafdf7adc1ba90d4846 /src/core/lib/iomgr/endpoint_pair_windows.c | |
parent | 40c8fba13c7cbed7df5f92b3bab4131178410ccd (diff) | |
parent | 80eb075e633219cf8972e778eb449d2271ee92ad (diff) |
Merge github.com:grpc/grpc into decouple_version_number
Diffstat (limited to 'src/core/lib/iomgr/endpoint_pair_windows.c')
-rw-r--r-- | src/core/lib/iomgr/endpoint_pair_windows.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/core/lib/iomgr/endpoint_pair_windows.c b/src/core/lib/iomgr/endpoint_pair_windows.c index 582704e267..93f71b745c 100644 --- a/src/core/lib/iomgr/endpoint_pair_windows.c +++ b/src/core/lib/iomgr/endpoint_pair_windows.c @@ -31,9 +31,9 @@ * */ -#include <grpc/support/port_platform.h> +#include "src/core/lib/iomgr/port.h" -#ifdef GPR_WINSOCK_SOCKET +#ifdef GRPC_WINSOCK_SOCKET #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/sockaddr_utils.h" @@ -82,15 +82,16 @@ static void create_sockets(SOCKET sv[2]) { sv[0] = svr_sock; } -grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char *name, - size_t read_slice_size) { +grpc_endpoint_pair grpc_iomgr_create_endpoint_pair( + const char *name, grpc_resource_quota *resource_quota, + size_t read_slice_size) { SOCKET sv[2]; grpc_endpoint_pair p; create_sockets(sv); p.client = grpc_tcp_create(grpc_winsocket_create(sv[1], "endpoint:client"), - "endpoint:server"); + resource_quota, "endpoint:server"); p.server = grpc_tcp_create(grpc_winsocket_create(sv[0], "endpoint:server"), - "endpoint:client"); + resource_quota, "endpoint:client"); return p; } |