Merge pull request #17915 from mjstapp/compile_wshadow

author David Lamparter <equinox@opensourcerouting.org>

Wed, 9 Apr 2025 07:59:06 +0000 (09:59 +0200)

committer GitHub <noreply@github.com>

Wed, 9 Apr 2025 07:59:06 +0000 (09:59 +0200)
author David Lamparter <equinox@opensourcerouting.org>
Wed, 9 Apr 2025 07:59:06 +0000 (09:59 +0200)
committer GitHub <noreply@github.com>
Wed, 9 Apr 2025 07:59:06 +0000 (09:59 +0200)
diff --cc babeld/babeld.c
Simple merge
diff --cc bgpd/bgpd.c
Simple merge
author	David Lamparter <equinox@opensourcerouting.org>
	Wed, 9 Apr 2025 07:59:06 +0000 (09:59 +0200)
committer	GitHub <noreply@github.com>
	Wed, 9 Apr 2025 07:59:06 +0000 (09:59 +0200)
		1	2
babeld/babeld.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.c	patch \|	diff1 \|	diff2 \|	blob \| history