From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 10 Jan 2023 13:08:41 +0000 (+0100)
Subject: fundamental: fix compile check for explicit_bzero
X-Git-Tag: v253-rc1~137^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5deb391c6e6d2b8fd7b94234efea49cd6bee0d76;p=thirdparty%2Fsystemd.git

fundamental: fix compile check for explicit_bzero

Our HAVE_* variables are defined to 0 or 1, so '#if defined(HAVE_*)' is always true.
The variable is not defined when compiling for EFI though, so we need the
additional guard.

Fixup for 3f92dc2fd4070b213e6bc85263a9bef06ec9a486.

(I don't want to do something like add -DHAVE_EXPLICIT_BZERO=0 to the commandline
in src/efi/boot/meson.build, because this quite verbose. Our compilation commandlines
are very long already. Let's instead keep this localized in this one spot in the
source file.)x
---

diff --git a/src/fundamental/memory-util-fundamental.h b/src/fundamental/memory-util-fundamental.h
index 9015300ae85..76f37e523b0 100644
--- a/src/fundamental/memory-util-fundamental.h
+++ b/src/fundamental/memory-util-fundamental.h
@@ -11,7 +11,7 @@
 
 #include "macro-fundamental.h"
 
-#if defined(HAVE_EXPLICIT_BZERO)
+#if !defined(SD_BOOT) && HAVE_EXPLICIT_BZERO
 static inline void *explicit_bzero_safe(void *p, size_t l) {
         if (p && l > 0)
                 explicit_bzero(p, l);