diff options
author | 2016-11-16 14:21:53 -0800 | |
---|---|---|
committer | 2016-11-16 14:21:53 -0800 | |
commit | d4ed4fd17442ff18ed08702c20de1294f468bb38 (patch) | |
tree | 7cfb34470824605fb2976498d56ffed970059520 /src/core/lib/channel/channel_stack.h | |
parent | 963be3727033668049a4de9f9ce1b507239e93f6 (diff) | |
parent | 740665a6f65b3d827e0755de8bb1bcd57745b9f1 (diff) |
Merge remote-tracking branch 'upstream/master' into security_handshaker3
Diffstat (limited to 'src/core/lib/channel/channel_stack.h')
-rw-r--r-- | src/core/lib/channel/channel_stack.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/lib/channel/channel_stack.h b/src/core/lib/channel/channel_stack.h index c3b662c969..004643d45f 100644 --- a/src/core/lib/channel/channel_stack.h +++ b/src/core/lib/channel/channel_stack.h @@ -231,7 +231,8 @@ grpc_error *grpc_call_stack_init( grpc_exec_ctx *exec_ctx, grpc_channel_stack *channel_stack, int initial_refs, grpc_iomgr_cb_func destroy, void *destroy_arg, grpc_call_context_element *context, const void *transport_server_data, - grpc_mdstr *path, gpr_timespec deadline, grpc_call_stack *call_stack); + grpc_mdstr *path, gpr_timespec start_time, gpr_timespec deadline, + grpc_call_stack *call_stack); /* Set a pollset or a pollset_set for a call stack: must occur before the first * op is started */ void grpc_call_stack_set_pollset_or_pollset_set(grpc_exec_ctx *exec_ctx, |