diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-08-26 10:58:17 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-08-26 10:58:17 -0700 |
| commit | c84d4aa6d08770335e1a5debbd2f3daff3897d19 (patch) | |
| tree | 85522ef3c538391da9fc8e40c0b929f00f150c80 /src/core/surface/init.c | |
| parent | 1dc323b45e1a109c860806cb25e7eca21c29a3c0 (diff) | |
| parent | 60e0e743bed05b248c485949c6cd9e05fa02b607 (diff) | |
Merge github.com:grpc/grpc into endpoints
Conflicts:
src/core/iomgr/tcp_windows.c
Diffstat (limited to 'src/core/surface/init.c')
| -rw-r--r-- | src/core/surface/init.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/surface/init.c b/src/core/surface/init.c index d9044549f2..0d48cd42d7 100644 --- a/src/core/surface/init.c +++ b/src/core/surface/init.c @@ -86,11 +86,11 @@ void grpc_init(void) { if (++g_initializations == 1) { gpr_time_init(); grpc_resolver_registry_init("dns:///"); - grpc_register_resolver_type("dns", grpc_dns_resolver_factory_create()); - grpc_register_resolver_type("ipv4", grpc_ipv4_resolver_factory_create()); - grpc_register_resolver_type("ipv6", grpc_ipv6_resolver_factory_create()); + grpc_register_resolver_type(grpc_dns_resolver_factory_create()); + grpc_register_resolver_type(grpc_ipv4_resolver_factory_create()); + grpc_register_resolver_type(grpc_ipv6_resolver_factory_create()); #ifdef GPR_POSIX_SOCKET - grpc_register_resolver_type("unix", grpc_unix_resolver_factory_create()); + grpc_register_resolver_type(grpc_unix_resolver_factory_create()); #endif grpc_register_tracer("channel", &grpc_trace_channel); grpc_register_tracer("surface", &grpc_surface_trace); |