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/resolver/fake | |
| parent | ede1b2703d4058578b8b5830f006c89c9216521b (diff) | |
| parent | 74a53c2440823e7b53741edba883ff1f4fb8f23a (diff) | |
Merge master after no Extern C changes
Diffstat (limited to 'src/core/ext/filters/client_channel/resolver/fake')
| -rw-r--r-- | src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc | 4 | ||||
| -rw-r--r-- | src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc index 74840811d9..fe3ad1403c 100644 --- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc @@ -250,8 +250,8 @@ static const grpc_resolver_factory_vtable fake_resolver_factory_vtable = { static grpc_resolver_factory fake_resolver_factory = { &fake_resolver_factory_vtable}; -extern "C" void grpc_resolver_fake_init(void) { +void grpc_resolver_fake_init(void) { grpc_register_resolver_type(&fake_resolver_factory); } -extern "C" void grpc_resolver_fake_shutdown(void) {} +void grpc_resolver_fake_shutdown(void) {} diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h index e2008e948e..a8977e5980 100644 --- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h +++ b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h @@ -21,10 +21,6 @@ #include "src/core/ext/filters/client_channel/uri_parser.h" #include "src/core/lib/channel/channel_args.h" -#ifdef __cplusplus -extern "C" { -#endif - #define GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR \ "grpc.fake_resolver.response_generator" @@ -60,9 +56,5 @@ grpc_fake_resolver_response_generator_ref( void grpc_fake_resolver_response_generator_unref( grpc_fake_resolver_response_generator* generator); -#ifdef __cplusplus -} -#endif - #endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_FAKE_FAKE_RESOLVER_H \ */ |