diff options
author | Tim Emiola <tbetbetbe@users.noreply.github.com> | 2015-10-02 13:43:14 -0700 |
---|---|---|
committer | Tim Emiola <tbetbetbe@users.noreply.github.com> | 2015-10-02 13:43:14 -0700 |
commit | 25061413cf979f7dfed9f3cd63a08450d64f96ba (patch) | |
tree | a550fd00f62a2ea284ce09c2068f9651b53e72f8 /src/core/iomgr | |
parent | 1f8efa266d585dc5a4d450da3b27e758e71d3250 (diff) | |
parent | a1902c867dcdb3e849b14cc43dcfe9f05ffb87b4 (diff) |
Merge pull request #3602 from grpc/release-0_11
Upmerge from beta to master.
Diffstat (limited to 'src/core/iomgr')
-rw-r--r-- | src/core/iomgr/udp_server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/iomgr/udp_server.c b/src/core/iomgr/udp_server.c index 59df47fcb3..1304f2067e 100644 --- a/src/core/iomgr/udp_server.c +++ b/src/core/iomgr/udp_server.c @@ -232,7 +232,7 @@ static int prepare_socket(int fd, const struct sockaddr *addr, rc = setsockopt(fd, IPPROTO_IP, IP_PKTINFO, &get_local_ip, sizeof(get_local_ip)); if (rc == 0 && addr->sa_family == AF_INET6) { -#if !TARGET_OS_IPHONE +#if !defined(__APPLE__) rc = setsockopt(fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, &get_local_ip, sizeof(get_local_ip)); #endif |