diff options
| author |  David Garcia Quintas <dgq@google.com> | 2018-06-11 15:52:42 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2018-06-11 15:52:42 -0700 |
| commit | 32c04931db9ef88159a59c18b47288c445faa00d (patch) | |
| tree | e29c48dde7d51a06f2d02a26b8576b7b63055079 /src/core/ext/filters/client_channel | |
| parent | dd8bc8cfb468807c5b4576aa8816b0cc0c7aeef7 (diff) | |
| parent | b12b813ed8cba02ee56689034069aaae2e455a3f (diff) | |
Merge branch 'master' of github.com:grpc/grpc into nanopb_build_cleanup
Diffstat (limited to 'src/core/ext/filters/client_channel')
| -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 b604f2bf14..ebe2c4c41c 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) */ |