diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2017-06-27 16:59:16 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-06-27 16:59:16 -0700 |
| commit | d8bf2df7c638ace0cdcc73bce3101db77448ba04 (patch) | |
| tree | f82bbfe0f7f58d0d4117a2e52384fd43de23e933 /src | |
| parent | 71a78e92cb9f6af405e6f80c9a31c408c4025095 (diff) | |
| parent | 04af8321b71fbfef59abfeac474bca7b47daec4c (diff) | |
Merge pull request #10462 from nicolasnoble/ares-header-pollution
Avoid pollution from ares.h into the global space.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h | 2 | ||||
| -rw-r--r-- | src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h index eb1a8ab011..386012d2ed 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h @@ -19,8 +19,6 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H -#include <ares.h> - #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.c b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.c index 4e79c44ba3..1ab8295e9e 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.c +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.c @@ -19,6 +19,8 @@ #include "src/core/lib/iomgr/port.h" #if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET) +#include <ares.h> + #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h" #include <grpc/support/alloc.h> |