From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 28 Feb 2025 15:14:24 +0000 (+0900)
Subject: memory-util: explicit_bzero() exists since glibc-2.25
X-Git-Tag: v258-rc1~1195^2~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e22dd218af5c81a30945742b323777cdc5511b4;p=thirdparty%2Fsystemd.git

memory-util: explicit_bzero() exists since glibc-2.25
---

diff --git a/meson.build b/meson.build
index 05c13e947fc..108e3d46b05 100644
--- a/meson.build
+++ b/meson.build
@@ -615,7 +615,6 @@ foreach ident : [
                                  #include <keyutils.h>'''],
         ['bpf',               '''#include <sys/syscall.h>
                                  #include <unistd.h>'''],
-        ['explicit_bzero' ,   '''#include <string.h>'''],
         ['reallocarray',      '''#include <stdlib.h>'''],
         ['set_mempolicy',     '''#include <stdlib.h>
                                  #include <unistd.h>'''],
diff --git a/src/fundamental/memory-util-fundamental.h b/src/fundamental/memory-util-fundamental.h
index 6870f54f584..6c3aac34a20 100644
--- a/src/fundamental/memory-util-fundamental.h
+++ b/src/fundamental/memory-util-fundamental.h
@@ -17,7 +17,7 @@
                 _l_ > 0 ? memset((x), 0, _l_) : (x);            \
         })
 
-#if !SD_BOOT && HAVE_EXPLICIT_BZERO
+#if !SD_BOOT
 static inline void *explicit_bzero_safe(void *p, size_t l) {
         if (p && l > 0)
                 explicit_bzero(p, l);