diff options
| author |  Muxi Yan <mxyan@google.com> | 2017-10-06 18:47:09 -0700 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-10-06 18:47:09 -0700 |
| commit | 03fc857a6f3ad1ee0a6f46cd19b5c96e56c6fd3b (patch) | |
| tree | 38e03428954c3abdf2c88cafa9ffbd205789976b /src/core/ext/filters/client_channel/subchannel.h | |
| parent | 63602748415fb836afd7a9685fbe5e85bf5ebfed (diff) | |
| parent | 03bd5daf5cd36373152cb6b06a5f259db1331e87 (diff) | |
Merge remote-tracking branch 'upstream/master' into fix-stream-compression-config-interface
Diffstat (limited to 'src/core/ext/filters/client_channel/subchannel.h')
| -rw-r--r-- | src/core/ext/filters/client_channel/subchannel.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/core/ext/filters/client_channel/subchannel.h b/src/core/ext/filters/client_channel/subchannel.h index 51d712f6a7..46b29f1fe0 100644 --- a/src/core/ext/filters/client_channel/subchannel.h +++ b/src/core/ext/filters/client_channel/subchannel.h @@ -26,6 +26,10 @@ #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/metadata.h" +#ifdef __cplusplus +extern "C" { +#endif + // Channel arg containing a grpc_resolved_address to connect to. #define GRPC_ARG_SUBCHANNEL_ADDRESS "grpc.subchannel_address" @@ -103,7 +107,7 @@ typedef struct { grpc_polling_entity *pollent; grpc_slice path; gpr_timespec start_time; - gpr_timespec deadline; + grpc_millis deadline; gpr_arena *arena; grpc_call_context_element *context; grpc_call_combiner *call_combiner; @@ -188,4 +192,8 @@ const char *grpc_get_subchannel_address_uri_arg(const grpc_channel_args *args); /// Caller is responsible for freeing the string. grpc_arg grpc_create_subchannel_address_arg(const grpc_resolved_address *addr); +#ifdef __cplusplus +} +#endif + #endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_SUBCHANNEL_H */ |