changeset 5272:97e87c65302e draft

Appease older compilers
author Roy Marples <roy@marples.name>
date Wed, 27 May 2020 15:53:21 +0000
parents 8fb09d31d388
children 3a33b39120eb
files src/dhcp.c src/sa.c
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/dhcp.c	Wed May 27 15:52:01 2020 +0000
+++ b/src/dhcp.c	Wed May 27 15:53:21 2020 +0000
@@ -3375,9 +3375,11 @@
 		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;
--- a/src/sa.c	Wed May 27 15:52:01 2020 +0000
+++ b/src/sa.c	Wed May 27 15:53:21 2020 +0000
@@ -288,7 +288,7 @@
 #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);