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.h | |
| parent | ede1b2703d4058578b8b5830f006c89c9216521b (diff) | |
| parent | 74a53c2440823e7b53741edba883ff1f4fb8f23a (diff) | |
Merge master after no Extern C changes
Diffstat (limited to 'src/core/ext/filters/client_channel/resolver.h')
| -rw-r--r-- | src/core/ext/filters/client_channel/resolver.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/core/ext/filters/client_channel/resolver.h b/src/core/ext/filters/client_channel/resolver.h index 7ff21b4d2c..f6a4af01d6 100644 --- a/src/core/ext/filters/client_channel/resolver.h +++ b/src/core/ext/filters/client_channel/resolver.h @@ -22,10 +22,6 @@ #include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/lib/iomgr/iomgr.h" -#ifdef __cplusplus -extern "C" { -#endif - typedef struct grpc_resolver grpc_resolver; typedef struct grpc_resolver_vtable grpc_resolver_vtable; @@ -86,8 +82,4 @@ void grpc_resolver_next_locked(grpc_resolver* resolver, grpc_channel_args** result, grpc_closure* on_complete); -#ifdef __cplusplus -} -#endif - #endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_H */ |