From 2d3b96969506b6b6e15eb2ffa0c737c7aba8feb2 Mon Sep 17 00:00:00 2001 From: Michael Tuexen <tuexen@fh-muenster.de> Date: Tue, 24 Apr 2018 22:43:02 +0200 Subject: [PATCH] Fix #ifdef __APPLE__ issues. --- gtests/net/packetdrill/parser.y | 4 ++-- gtests/net/packetdrill/tcp.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gtests/net/packetdrill/parser.y b/gtests/net/packetdrill/parser.y index 9d00c784..d7bd9c1c 100644 --- a/gtests/net/packetdrill/parser.y +++ b/gtests/net/packetdrill/parser.y @@ -3093,7 +3093,7 @@ sockaddr struct sockaddr_in *ipv4 = malloc(sizeof(struct sockaddr_in)); memset(ipv4, 0, sizeof(*ipv4)); ipv4->sin_family = AF_INET; -#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) ipv4->sin_len = sizeof(*ipv4); #endif ipv4->sin_port = htons($10); @@ -3108,7 +3108,7 @@ sockaddr struct sockaddr_in6 *ipv6 = malloc(sizeof(struct sockaddr_in6)); memset(ipv6, 0, sizeof(*ipv6)); ipv6->sin6_family = AF_INET6; -#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) ipv6->sin6_len = sizeof(*ipv6); #endif ipv6->sin6_port = htons($10); diff --git a/gtests/net/packetdrill/tcp.h b/gtests/net/packetdrill/tcp.h index f484cdd8..da9cbe67 100644 --- a/gtests/net/packetdrill/tcp.h +++ b/gtests/net/packetdrill/tcp.h @@ -40,7 +40,7 @@ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) #define SOL_TCP IPPROTO_TCP -#endif /* defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) */ +#endif /* defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) */ #ifdef linux -- GitLab