diff options
author | Yash Tibrewal <yashkt@google.com> | 2017-11-30 17:47:36 -0800 |
---|---|---|
committer | Yash Tibrewal <yashkt@google.com> | 2017-11-30 17:47:36 -0800 |
commit | 36522e9f8008cade840b75f53164602719577bc6 (patch) | |
tree | dad5fcaa9e6e23923da427fbe36d7dbd6f288ba3 /src/core/ext/filters/client_channel/subchannel.h | |
parent | ede1b2703d4058578b8b5830f006c89c9216521b (diff) | |
parent | 74a53c2440823e7b53741edba883ff1f4fb8f23a (diff) |
Merge master after no Extern C changes
Diffstat (limited to 'src/core/ext/filters/client_channel/subchannel.h')
-rw-r--r-- | src/core/ext/filters/client_channel/subchannel.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/core/ext/filters/client_channel/subchannel.h b/src/core/ext/filters/client_channel/subchannel.h index e65d043b0b..84d9fa27a1 100644 --- a/src/core/ext/filters/client_channel/subchannel.h +++ b/src/core/ext/filters/client_channel/subchannel.h @@ -26,10 +26,6 @@ #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" @@ -179,8 +175,4 @@ 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 */ |