diff options
| author |  Alexander Polcyn <apolcyn@google.com> | 2017-12-28 18:09:19 -0800 |
|---|---|---|
| committer | Alexander Polcyn <apolcyn@google.com> | 2018-03-20 23:51:23 -0700 |
| commit | d21ee150765c73876992bbf06c716b4600ba047f (patch) | |
| tree | ef97400ceb7007fc0c1498e61adf851cdc0eaa26 /third_party/address_sorting/address_sorting_internal.h | |
| parent | 690dde672a877083e29ee5af0b8252697aa48fa0 (diff) | |
Stop relying on certain ipv6 macros. Also bazel build updates.
Fix error just made in bazel/grpc_build_system.bzl
Fix merge conflict support/env -> gpr/env
Diffstat (limited to 'third_party/address_sorting/address_sorting_internal.h')
| -rw-r--r-- | third_party/address_sorting/address_sorting_internal.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/third_party/address_sorting/address_sorting_internal.h b/third_party/address_sorting/address_sorting_internal.h index 9712c96599..ee366fef1c 100644 --- a/third_party/address_sorting/address_sorting_internal.h +++ b/third_party/address_sorting/address_sorting_internal.h @@ -51,7 +51,10 @@ /* Workaround for issue described in * * https://bugs.launchpad.net/ubuntu/+source/eglibc/+bug/1187301 */ +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif +#include <arpa/inet.h> #include <netinet/in.h> #include <sys/socket.h> #define ADDRESS_SORTING_POSIX 1 |