diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-08-18 16:11:09 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-08-18 16:11:09 -0700 |
| commit | 7fc37a23856604259a0b048e0df00ef3065a58d8 (patch) | |
| tree | 9e3b7622f474d15a43b753912582234b81588e32 /src/core/channel/client_channel.h | |
| parent | beac88ca56f4710e86668f2cbbd80e02e0607f9c (diff) | |
| parent | 7ff63f6abad6c49a7b88b036c54075a03433457c (diff) | |
Merge branch 'master' of github.com:grpc/grpc into compression-accept-encoding
Diffstat (limited to 'src/core/channel/client_channel.h')
| -rw-r--r-- | src/core/channel/client_channel.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/channel/client_channel.h b/src/core/channel/client_channel.h index cd81294eb3..13681e3956 100644 --- a/src/core/channel/client_channel.h +++ b/src/core/channel/client_channel.h @@ -59,11 +59,12 @@ void grpc_client_channel_watch_connectivity_state( grpc_channel_element *elem, grpc_connectivity_state *state, grpc_iomgr_closure *on_complete); -grpc_pollset_set *grpc_client_channel_get_connecting_pollset_set(grpc_channel_element *elem); +grpc_pollset_set *grpc_client_channel_get_connecting_pollset_set( + grpc_channel_element *elem); void grpc_client_channel_add_interested_party(grpc_channel_element *channel, - grpc_pollset *pollset); + grpc_pollset *pollset); void grpc_client_channel_del_interested_party(grpc_channel_element *channel, - grpc_pollset *pollset); + grpc_pollset *pollset); #endif /* GRPC_INTERNAL_CORE_CHANNEL_CLIENT_CHANNEL_H */ |