diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2023-01-10 14:08:41 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2023-01-10 14:23:27 +0100 |
| commit | 5deb391c6e6d2b8fd7b94234efea49cd6bee0d76 (patch) | |
| tree | 35027253358612b50a4ca6c21a1580a89bad6adf /src/fundamental | |
| parent | kernel-install: refactor some variables (diff) | |
| download | systemd-5deb391c6e6d2b8fd7b94234efea49cd6bee0d76.tar.xz systemd-5deb391c6e6d2b8fd7b94234efea49cd6bee0d76.zip | |
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
Diffstat (limited to 'src/fundamental')
| -rw-r--r-- | src/fundamental/memory-util-fundamental.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fundamental/memory-util-fundamental.h b/src/fundamental/memory-util-fundamental.h index 9015300ae8..76f37e523b 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); |