diff options
author | Mark D. Roth <roth@google.com> | 2016-07-25 13:06:49 -0700 |
---|---|---|
committer | Mark D. Roth <roth@google.com> | 2016-07-25 13:06:49 -0700 |
commit | 889e02e29da6ec5e663cf1e8009a7dc4996df3fe (patch) | |
tree | 029437ccf6596070e08d8368ef2935d472c0c507 /src/core/lib | |
parent | e106570dc37f2d590033b89427a2c06d7592264b (diff) | |
parent | 734cbe79427a51bd5e2baaafee84694af96a3d7e (diff) |
Merge branch 'handshake_api' into http_connect
Diffstat (limited to 'src/core/lib')
-rw-r--r-- | src/core/lib/channel/handshaker.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/lib/channel/handshaker.h b/src/core/lib/channel/handshaker.h index b1a0ba8739..dfc469c417 100644 --- a/src/core/lib/channel/handshaker.h +++ b/src/core/lib/channel/handshaker.h @@ -60,8 +60,7 @@ typedef struct grpc_handshaker grpc_handshaker; typedef void (*grpc_handshaker_done_cb)(grpc_exec_ctx* exec_ctx, grpc_endpoint* endpoint, grpc_channel_args* args, - void* user_data, - grpc_error* error); + void* user_data, grpc_error* error); struct grpc_handshaker_vtable { /// Destroys the handshaker. |