diff options
author | Craig Tiller <craig.tiller@gmail.com> | 2015-06-04 08:44:53 -0700 |
---|---|---|
committer | Craig Tiller <craig.tiller@gmail.com> | 2015-06-04 08:44:53 -0700 |
commit | 409263c59f40d6b4754528cd91ffefd20d7987b2 (patch) | |
tree | eee5cfc0d643ecfde7ef4188a1308c79a4d31ebb /src/core/iomgr/sockaddr_utils.c | |
parent | da11694971f12ee973e84c9386494a161228e51a (diff) | |
parent | bed8a0699e7440ab13cddda03a398bad26117f5b (diff) |
Merge github.com:grpc/grpc into we-dont-need-no-backup
Conflicts:
tools/doxygen/Doxyfile.core.internal
Diffstat (limited to 'src/core/iomgr/sockaddr_utils.c')
-rw-r--r-- | src/core/iomgr/sockaddr_utils.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/iomgr/sockaddr_utils.c b/src/core/iomgr/sockaddr_utils.c index 3d202a5cc8..e91b94f8c8 100644 --- a/src/core/iomgr/sockaddr_utils.c +++ b/src/core/iomgr/sockaddr_utils.c @@ -40,6 +40,7 @@ #include <grpc/support/host_port.h> #include <grpc/support/log.h> #include <grpc/support/port_platform.h> +#include <grpc/support/string_util.h> static const gpr_uint8 kV4MappedPrefix[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff}; |