diff options
| author |  Mark D. Roth <roth@google.com> | 2016-10-26 09:12:25 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-10-26 09:12:25 -0700 |
| commit | fb809b78508b8ab0cca85fab63e8fbcde2540d32 (patch) | |
| tree | bdb1e9c208d72e8d627a348de32388f5eea1d816 /src/core/lib/iomgr/resolve_address.h | |
| parent | b477cebbe77fca069fb2a4bb1e9806e0891ead83 (diff) | |
| parent | 4c2e3e7bb9f32d252a664bb83c5dea3ecda65a9b (diff) | |
Merge remote-tracking branch 'upstream/master' into resolver_channel_args
Diffstat (limited to 'src/core/lib/iomgr/resolve_address.h')
| -rw-r--r-- | src/core/lib/iomgr/resolve_address.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/resolve_address.h b/src/core/lib/iomgr/resolve_address.h index ddbe375755..275924448a 100644 --- a/src/core/lib/iomgr/resolve_address.h +++ b/src/core/lib/iomgr/resolve_address.h @@ -36,7 +36,6 @@ #include <stddef.h> #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/iomgr/iomgr.h" #define GRPC_MAX_SOCKADDR_SIZE 128 |