diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2018-06-11 16:33:15 -0700 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2018-06-11 16:33:15 -0700 |
| commit | dddf20793269a7ba5f658ae5fdcde2c175cf196b (patch) | |
| tree | 595d0fbc0c501132857b63f00f073ec6a0f54f58 /src/core/ext/filters/client_channel/resolver | |
| parent | 935ae7d01242c21f0230ead18927087a70c03e5b (diff) | |
| parent | 37b292a0f7500e434c9ae41919248e2641ddc7f1 (diff) | |
Merge branch 'master' into epollerr
Diffstat (limited to 'src/core/ext/filters/client_channel/resolver')
| -rw-r--r-- | src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc index 73d2af6e42..00a84302ed 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc @@ -18,7 +18,7 @@ #include <grpc/support/port_platform.h> #include "src/core/lib/iomgr/port.h" -#if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET) +#if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) #include <ares.h> #include <sys/ioctl.h> @@ -348,4 +348,4 @@ void grpc_ares_ev_driver_start(grpc_ares_ev_driver* ev_driver) { gpr_mu_unlock(&ev_driver->mu); } -#endif /* GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET) */ +#endif /* GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) */ |