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 47eabdb34997d6e0f9e770b9a7a19536fdc961f2..a99d0dae64750ca34eb1e69d4a1f2d728eff35b4 100644 (file)
--- 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 48b1343f5c3109211b21456ceda9989288a64241..81c40e087ff42addb697120a9d86baf33d89b861 100644 (file)
--- 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 0f631d505310325c7b4060ca8e776b1e5e9f8e51..b8d100ff6b384ca12141ff4cad3281579d607038 100644 (file)
--- 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 9f8b0106fe63da7ba7ededffd6af6803904fa349..108c43b45aa03acc44a350f6efb85d60916d15b3 100644 (file)
--- 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"