1
0
mirror of https://github.com/openbsd/src.git synced 2026-06-18 07:13:36 +02:00

Revert the "gcc3 doesn't support anonymous unions that much" workarounds.

I promised claudio@ these wouldn't last long, and we're barely above 18
months.
This commit is contained in:
miod
2025-10-23 18:55:30 +00:00
parent e4ebf5d0a7
commit 7e7bebd08c
2 changed files with 3 additions and 15 deletions
+1 -8
View File
@@ -1,4 +1,4 @@
/* $OpenBSD: rde.c,v 1.656 2025/06/04 09:12:34 claudio Exp $ */
/* $OpenBSD: rde.c,v 1.657 2025/10/23 18:55:30 miod Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -1253,17 +1253,10 @@ rde_dispatch_imsg_rtr(struct imsgbuf *imsgbuf)
if (imsg_get_data(&imsg, &roa, sizeof(roa)) == -1)
fatalx("IMSG_RECONF_ROA_ITEM bad len");
if (trie_roa_add(&roa_new.th, &roa) != 0) {
#if defined(__GNUC__) && __GNUC__ < 4
struct bgpd_addr p = {
.aid = roa.aid
};
p.v6 = roa.prefix.inet6;
#else
struct bgpd_addr p = {
.aid = roa.aid,
.v6 = roa.prefix.inet6
};
#endif
log_warnx("trie_roa_add %s/%u failed",
log_addr(&p), roa.prefixlen);
}
+2 -7
View File
@@ -1,4 +1,4 @@
/* $OpenBSD: util.c,v 1.95 2025/03/26 15:29:30 claudio Exp $ */
/* $OpenBSD: util.c,v 1.96 2025/10/23 18:55:30 miod Exp $ */
/*
* Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -249,13 +249,8 @@ const char *
log_roa(struct roa *roa)
{
static char buf[256];
char maxbuf[32];
#if defined(__GNUC__) && __GNUC__ < 4
struct bgpd_addr addr = { .aid = roa->aid };
addr.v6 = roa->prefix.inet6;
#else
struct bgpd_addr addr = { .aid = roa->aid, .v6 = roa->prefix.inet6 };
#endif
char maxbuf[32];
maxbuf[0] = '\0';
if (roa->prefixlen != roa->maxlen)