From e514b5071c75c1a4d25a9fc925e5574007dd0ac3 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 11 Nov 2021 15:29:53 +0100
Subject: [PATCH] =?utf8?q?fundamental:=20rename=20type.h=20=E2=86=92=20typ?=
 =?utf8?q?es-fundamental.h?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

"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.
---
 src/fundamental/bootspec-fundamental.h          | 2 +-
 src/fundamental/macro-fundamental.h             | 2 +-
 src/fundamental/meson.build                     | 2 +-
 src/fundamental/sha256.h                        | 2 +-
 src/fundamental/{type.h => types-fundamental.h} | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename src/fundamental/{type.h => types-fundamental.h} (100%)

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
-- 
2.47.3