From db18c1c61c41c3100627f3766f169c7739c37836 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Wed, 27 May 2020 15:53:21 +0000 Subject: [PATCH] Appease older compilers --- src/dhcp.c | 8 +++++--- src/sa.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/dhcp.c b/src/dhcp.c index 744e6954..a7f60205 100644 --- a/src/dhcp.c +++ b/src/dhcp.c @@ -3375,9 +3375,11 @@ checksums_valid(void *packet, struct ip ip; uint16_t w[sizeof(struct ip) / 2]; } pip = { - .ip.ip_p = IPPROTO_UDP, - .ip.ip_src = ip->ip_src, - .ip.ip_dst = ip->ip_dst, + .ip = { + .ip_p = IPPROTO_UDP, + .ip_src = ip->ip_src, + .ip_dst = ip->ip_dst, + } }; size_t ip_hlen; struct udphdr udp; diff --git a/src/sa.c b/src/sa.c index 97e5e874..4d898b4e 100644 --- a/src/sa.c +++ b/src/sa.c @@ -288,7 +288,7 @@ sa_toprefix(const struct sockaddr *sa) #ifndef NDEBUG /* Ensure the calculation is correct */ if (!sa_inprefix) { - union sa_ss ss = { .sa.sa_family = sa->sa_family }; + union sa_ss ss = { .sa = { .sa_family = sa->sa_family } }; sa_inprefix = true; sa_fromprefix(&ss.sa, prefix); -- 2.47.2