]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Appease older compilers
authorRoy Marples <roy@marples.name>
Wed, 27 May 2020 15:53:21 +0000 (15:53 +0000)
committerRoy Marples <roy@marples.name>
Wed, 27 May 2020 15:53:21 +0000 (15:53 +0000)
src/dhcp.c
src/sa.c

index 744e6954ec8b1ba06a54f10f683683b88b9873a8..a7f602056c0bc4a09433e8cac60e6a5d21c93ed7 100644 (file)
@@ -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;
index 97e5e874d8f30e485578f856900e32478b55d95f..4d898b4ecd79d1bfe3c1d0fa81f36a94fbbcaaf1 100644 (file)
--- 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);