From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 25 Apr 2025 13:50:50 +0000 (+0200)
Subject: fundamental: Insert some missing conditional includes
X-Git-Tag: v258-rc1~701^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=194373f313ae5b0e13c48bf60a5c13506feaf763;p=thirdparty%2Fsystemd.git

fundamental: Insert some missing conditional includes

IWYU can't insert these inside the correct condition itself so we
add these manually in a separate commit.
---

diff --git a/src/fundamental/chid-fundamental.c b/src/fundamental/chid-fundamental.c
index 47eabdb3499..a99d0dae647 100644
--- a/src/fundamental/chid-fundamental.c
+++ b/src/fundamental/chid-fundamental.c
@@ -15,6 +15,7 @@
  */
 
 #if SD_BOOT
+#  include "efi-string.h"
 #  include "util.h"
 #else
 #  include <byteswap.h>
diff --git a/src/fundamental/chid-fundamental.h b/src/fundamental/chid-fundamental.h
index 48b1343f5c3..81c40e087ff 100644
--- a/src/fundamental/chid-fundamental.h
+++ b/src/fundamental/chid-fundamental.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #if SD_BOOT
-#  include "efi-string.h"
+#  include "efi.h"
 #else
 #  include <uchar.h>
 #endif
diff --git a/src/fundamental/sha1-fundamental.c b/src/fundamental/sha1-fundamental.c
index 0f631d50531..b8d100ff6b3 100644
--- a/src/fundamental/sha1-fundamental.c
+++ b/src/fundamental/sha1-fundamental.c
@@ -76,6 +76,12 @@ Still 100% public domain
 modified for use with systemd
 */
 
+#if SD_BOOT
+#  include "efi-string.h"
+#else
+#  include <string.h>
+#endif
+
 #include "memory-util-fundamental.h"
 #include "sha1-fundamental.h"
 
diff --git a/src/fundamental/sha256-fundamental.c b/src/fundamental/sha256-fundamental.c
index 9f8b0106fe6..108c43b45aa 100644
--- a/src/fundamental/sha256-fundamental.c
+++ b/src/fundamental/sha256-fundamental.c
@@ -21,6 +21,12 @@
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
+#if SD_BOOT
+#  include "efi-string.h"
+#else
+#  include <string.h>
+#endif
+
 #include "assert-fundamental.h"
 #include "macro-fundamental.h"
 #include "memory-util-fundamental.h"