diff options
author | murgatroid99 <mlumish@google.com> | 2016-08-22 14:57:22 -0700 |
---|---|---|
committer | murgatroid99 <mlumish@google.com> | 2016-08-22 14:57:22 -0700 |
commit | 6257159a3ae19f5caa3b44bcd201fc9183963cfe (patch) | |
tree | a121ba904b5c28860d2fb26a6e98c0ce3c34ce1d /src/core/ext/resolver | |
parent | daf46996529a983013892344803539e9ae888f24 (diff) | |
parent | 2f320cac223d9b4c72e9e2d6eb8d194a6d73d4bf (diff) |
Merge branch 'port_platform_split' into uv_core_transport
Diffstat (limited to 'src/core/ext/resolver')
-rw-r--r-- | src/core/ext/resolver/sockaddr/sockaddr_resolver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/ext/resolver/sockaddr/sockaddr_resolver.c b/src/core/ext/resolver/sockaddr/sockaddr_resolver.c index 1f7cce2f43..d613c5393e 100644 --- a/src/core/ext/resolver/sockaddr/sockaddr_resolver.c +++ b/src/core/ext/resolver/sockaddr/sockaddr_resolver.c @@ -163,7 +163,7 @@ static char *ipv6_get_default_authority(grpc_resolver_factory *factory, return ip_get_default_authority(uri); } -#ifdef GPR_HAVE_UNIX_SOCKET +#ifdef GRPC_HAVE_UNIX_SOCKET char *unix_get_default_authority(grpc_resolver_factory *factory, grpc_uri *uri) { return gpr_strdup("localhost"); @@ -271,7 +271,7 @@ static void sockaddr_factory_unref(grpc_resolver_factory *factory) {} static grpc_resolver_factory name##_resolver_factory = { \ &name##_factory_vtable} -#ifdef GPR_HAVE_UNIX_SOCKET +#ifdef GRPC_HAVE_UNIX_SOCKET DECL_FACTORY(unix); #endif DECL_FACTORY(ipv4); @@ -280,7 +280,7 @@ DECL_FACTORY(ipv6); void grpc_resolver_sockaddr_init(void) { grpc_register_resolver_type(&ipv4_resolver_factory); grpc_register_resolver_type(&ipv6_resolver_factory); -#ifdef GPR_HAVE_UNIX_SOCKET +#ifdef GRPC_HAVE_UNIX_SOCKET grpc_register_resolver_type(&unix_resolver_factory); #endif } |