summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2021-11-11 15:29:53 +0100
committerLennart Poettering <lennart@poettering.net>2021-11-11 17:23:09 +0100
commite514b5071c75c1a4d25a9fc925e5574007dd0ac3 (patch)
treed4966ca0975fed4ff909b284acebab03a1f467f3
parentboot: line-break magic[] array to match osrel[] line breaks (diff)
downloadsystemd-e514b5071c75c1a4d25a9fc925e5574007dd0ac3.tar.xz
systemd-e514b5071c75c1a4d25a9fc925e5574007dd0ac3.zip
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.
-rw-r--r--src/fundamental/bootspec-fundamental.h2
-rw-r--r--src/fundamental/macro-fundamental.h2
-rw-r--r--src/fundamental/meson.build2
-rw-r--r--src/fundamental/sha256.h2
-rw-r--r--src/fundamental/types-fundamental.h (renamed from src/fundamental/type.h)0
5 files changed, 4 insertions, 4 deletions
diff --git a/src/fundamental/bootspec-fundamental.h b/src/fundamental/bootspec-fundamental.h
index 0a1fe5c5ba..2cb6d7daa1 100644
--- 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 44af0bd0a0..c52957a55c 100644
--- 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 26859653e6..287f0fe36a 100644
--- 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 9fc090b4e0..abc4167628 100644
--- 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/types-fundamental.h
index 2a9a114bbc..2a9a114bbc 100644
--- a/src/fundamental/type.h
+++ b/src/fundamental/types-fundamental.h