diff options
author | David Garcia Quintas <dgq@google.com> | 2015-10-07 16:33:29 -0700 |
---|---|---|
committer | David Garcia Quintas <dgq@google.com> | 2015-10-07 16:33:29 -0700 |
commit | 68a77e3260d20e95806ab4ecd1c5fd0b85a0ea69 (patch) | |
tree | 5ec10201accae77462009b3dc3fcba6d5a9efc0e /src/core/channel/client_channel.c | |
parent | 6a739c715321c7249ce17b3ff3fbd6594c10af2f (diff) | |
parent | b53b36e2b7fced8440241d58c3e24a3ece108cb6 (diff) |
Merge branch 'master' of github.com:grpc/grpc into cq_alarm
Diffstat (limited to 'src/core/channel/client_channel.c')
-rw-r--r-- | src/core/channel/client_channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/channel/client_channel.c b/src/core/channel/client_channel.c index b59b62a6aa..8e7cb27cfd 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -51,7 +51,7 @@ typedef struct call_data call_data; -typedef struct { +typedef struct client_channel_channel_data { /** metadata context for this channel */ grpc_mdctx *mdctx; /** resolver for this channel */ |