From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 11 Nov 2021 14:29:53 +0000 (+0100)
Subject: fundamental: rename type.h → types-fundamental.h
X-Git-Tag: v250-rc1~300^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e514b5071c75c1a4d25a9fc925e5574007dd0ac3;p=thirdparty%2Fsystemd.git

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 0a1fe5c5baa..2cb6d7daa10 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 44af0bd0a02..c52957a55c3 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 26859653e60..287f0fe36ad 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 9fc090b4e07..abc4167628d 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
similarity index 100%
rename from src/fundamental/type.h
rename to src/fundamental/types-fundamental.h