diff options
| author |  Mark D. Roth <roth@google.com> | 2016-10-07 09:02:28 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-10-07 09:02:28 -0700 |
| commit | 15195741d7758a80bcf901e7db05b3c57654c4a3 (patch) | |
| tree | 1a7cd9f6b80235306559176a34bcf0e5c7ec4407 /src/core/ext/client_channel/client_channel_factory.h | |
| parent | 2137cd8e9b84fd2f602a369ee5922a6fefce2efc (diff) | |
| parent | e5c744d9850a763639b2e7001cf2487e1c76133b (diff) | |
Merge remote-tracking branch 'upstream/master' into rename_client_config
Diffstat (limited to 'src/core/ext/client_channel/client_channel_factory.h')
| -rw-r--r-- | src/core/ext/client_channel/client_channel_factory.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/ext/client_channel/client_channel_factory.h b/src/core/ext/client_channel/client_channel_factory.h index cf6724a24b..28828c2eb6 100644 --- a/src/core/ext/client_channel/client_channel_factory.h +++ b/src/core/ext/client_channel/client_channel_factory.h @@ -31,8 +31,8 @@ * */ -#ifndef GRPC_CORE_EXT_CLIENT_CONFIG_CLIENT_CHANNEL_FACTORY_H -#define GRPC_CORE_EXT_CLIENT_CONFIG_CLIENT_CHANNEL_FACTORY_H +#ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_CLIENT_CHANNEL_FACTORY_H +#define GRPC_CORE_EXT_CLIENT_CHANNEL_CLIENT_CHANNEL_FACTORY_H #include <grpc/impl/codegen/grpc_types.h> @@ -82,4 +82,4 @@ grpc_channel *grpc_client_channel_factory_create_channel( grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *factory, const char *target, grpc_client_channel_type type, grpc_channel_args *args); -#endif /* GRPC_CORE_EXT_CLIENT_CONFIG_CLIENT_CHANNEL_FACTORY_H */ +#endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_CLIENT_CHANNEL_FACTORY_H */ |