fundamental: rename type.h → types-fundamental.h

"type.h" is a very generic name, but this header is very specific to
making the "fundaemtnal" stuff work, it maps genric types in two
distinct ways. Hence let's make clear in the header name already what
this is about.

diff --git a/src/fundamental/bootspec-fundamental.h b/src/fundamental/bootspec-fundamental.h
index 0a1fe5c5baae3e383f2027c0fc55359ecfe5ef81..2cb6d7daa10d9eaac566b62f63d7796b06dd429c 100644 (file)
--- a/src/fundamental/bootspec-fundamental.h
+++ b/src/fundamental/bootspec-fundamental.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "type.h"
+#include "types-fundamental.h"
 
 sd_bool bootspec_pick_name_version(
                 const sd_char *os_pretty_name,

diff --git a/src/fundamental/macro-fundamental.h b/src/fundamental/macro-fundamental.h
index 44af0bd0a02face3ccea3e62ca205f8e5aabaf28..c52957a55c3738bba195589df90f185250e829ce 100644 (file)
--- a/src/fundamental/macro-fundamental.h
+++ b/src/fundamental/macro-fundamental.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <limits.h>
-#include "type.h"
+#include "types-fundamental.h"
 
 #define _align_(x) __attribute__((__aligned__(x)))
 #define _const_ __attribute__((__const__))

diff --git a/src/fundamental/meson.build b/src/fundamental/meson.build
index 26859653e60ce1a4603aebac03f82886e13ae15d..287f0fe36ad9775af37e023fffb77436a1be8011 100644 (file)
--- a/src/fundamental/meson.build
+++ b/src/fundamental/meson.build
@@ -8,7 +8,7 @@ fundamental_headers = files(
         'macro-fundamental.h',
         'sha256.h',
         'string-util-fundamental.h',
-        'type.h')
+        'types-fundamental.h')
 
 sources = '''
         bootspec-fundamental.c

diff --git a/src/fundamental/sha256.h b/src/fundamental/sha256.h
index 9fc090b4e074eb8a22ad4ffde0390c2dfa16488a..abc4167628d8d3d5e005e87f917c29bccd9af69b 100644 (file)
--- a/src/fundamental/sha256.h
+++ b/src/fundamental/sha256.h
@@ -6,7 +6,7 @@
 #include <efilib.h>
 #endif
 
-#include "type.h"
+#include "types-fundamental.h"
 
 struct sha256_ctx {
         uint32_t H[8];

diff --git a/src/fundamental/type.h b/src/fundamental/type.h
deleted file mode 100644 (file)
index 2a9a114..0000000
--- a/src/fundamental/type.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-#pragma once
-
-#ifdef SD_BOOT
-#include <efi.h>
-
-typedef BOOLEAN sd_bool;
-typedef CHAR16  sd_char;
-typedef INTN    sd_int;
-typedef UINTN   size_t;
-
-#define true    TRUE
-#define false   FALSE
-#else
-#include <stdbool.h>
-#include <stdint.h>
-
-typedef bool    sd_bool;
-typedef char    sd_char;
-typedef int     sd_int;
-#endif

diff --git a/src/fundamental/types-fundamental.h b/src/fundamental/types-fundamental.h
new file mode 100644 (file)
index 0000000..2a9a114
--- /dev/null
+++ b/src/fundamental/types-fundamental.h
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+#pragma once
+
+#ifdef SD_BOOT
+#include <efi.h>
+
+typedef BOOLEAN sd_bool;
+typedef CHAR16  sd_char;
+typedef INTN    sd_int;
+typedef UINTN   size_t;
+
+#define true    TRUE
+#define false   FALSE
+#else
+#include <stdbool.h>
+#include <stdint.h>
+
+typedef bool    sd_bool;
+typedef char    sd_char;
+typedef int     sd_int;
+#endif