From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 25 Nov 2025 15:50:23 +0000 (+0100)
Subject: boot: Fix warning
X-Git-Tag: v259-rc2~15^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f62e4f5d8c727afee3f28d59571b50cb94b06ea;p=thirdparty%2Fsystemd.git

boot: Fix warning

memchr() is a macro on newer glibc so make sure to undefine it before
redefining it.
---

diff --git a/src/boot/efi-string.c b/src/boot/efi-string.c
index f051b5dd887..e7bf3a4702f 100644
--- a/src/boot/efi-string.c
+++ b/src/boot/efi-string.c
@@ -1055,6 +1055,7 @@ _used_ void *memcpy(void * restrict dest, const void * restrict src, size_t n);
 _used_ void *memset(void *p, int c, size_t n);
 #else
 /* And for userspace unit testing we need to give them an efi_ prefix. */
+#  undef memchr
 #  define memchr efi_memchr
 #  define memcmp efi_memcmp
 #  define memcpy efi_memcpy