diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-08-18 12:51:05 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-08-18 12:51:05 -0700 |
| commit | 128f4a9cfe34825543dab4e29c875b59af40e666 (patch) | |
| tree | 323e79e6d7dd98ef6aa23f93ec20736d10abd9ce /src/core/iomgr/tcp_posix.c | |
| parent | f2066040d2568e6ae90f6690fab91c63cd17fd6b (diff) | |
| parent | 4f21d3549c8f652a152ae086a74dd8415ecca8fa (diff) | |
Merge github.com:grpc/grpc into y12kdm3
Diffstat (limited to 'src/core/iomgr/tcp_posix.c')
| -rw-r--r-- | src/core/iomgr/tcp_posix.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/iomgr/tcp_posix.c b/src/core/iomgr/tcp_posix.c index 24fee0596f..360e6ebd8c 100644 --- a/src/core/iomgr/tcp_posix.c +++ b/src/core/iomgr/tcp_posix.c @@ -572,7 +572,8 @@ static void grpc_tcp_add_to_pollset(grpc_endpoint *ep, grpc_pollset *pollset) { grpc_pollset_add_fd(pollset, tcp->em_fd); } -static void grpc_tcp_add_to_pollset_set(grpc_endpoint *ep, grpc_pollset_set *pollset_set) { +static void grpc_tcp_add_to_pollset_set(grpc_endpoint *ep, + grpc_pollset_set *pollset_set) { grpc_tcp *tcp = (grpc_tcp *)ep; grpc_pollset_set_add_fd(pollset_set, tcp->em_fd); } |