aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/ext/filters/client_channel/client_channel_factory.h
diff options
context:
space:
mode:
authorGravatar Yash Tibrewal <yashkt@google.com>2017-11-30 17:47:36 -0800
committerGravatar Yash Tibrewal <yashkt@google.com>2017-11-30 17:47:36 -0800
commit36522e9f8008cade840b75f53164602719577bc6 (patch)
treedad5fcaa9e6e23923da427fbe36d7dbd6f288ba3 /src/core/ext/filters/client_channel/client_channel_factory.h
parentede1b2703d4058578b8b5830f006c89c9216521b (diff)
parent74a53c2440823e7b53741edba883ff1f4fb8f23a (diff)
Merge master after no Extern C changes
Diffstat (limited to 'src/core/ext/filters/client_channel/client_channel_factory.h')
-rw-r--r--src/core/ext/filters/client_channel/client_channel_factory.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/core/ext/filters/client_channel/client_channel_factory.h b/src/core/ext/filters/client_channel/client_channel_factory.h
index cc36a924ee..766ebb9389 100644
--- a/src/core/ext/filters/client_channel/client_channel_factory.h
+++ b/src/core/ext/filters/client_channel/client_channel_factory.h
@@ -27,10 +27,6 @@
// Channel arg key for client channel factory.
#define GRPC_ARG_CLIENT_CHANNEL_FACTORY "grpc.client_channel_factory"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
typedef struct grpc_client_channel_factory grpc_client_channel_factory;
typedef struct grpc_client_channel_factory_vtable
grpc_client_channel_factory_vtable;
@@ -73,8 +69,4 @@ grpc_channel* grpc_client_channel_factory_create_channel(
grpc_arg grpc_client_channel_factory_create_channel_arg(
grpc_client_channel_factory* factory);
-#ifdef __cplusplus
-}
-#endif
-
#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_FACTORY_H */